Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion generate/input/descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2456,7 +2456,11 @@
}
},
"time": {
"dupFunction": "git_time_dup"
"dupFunction": "git_time_dup",
"dependencies": [
"git2/sys/time.h"
]

},
"trace": {
"functions": {
Expand Down
1,675 changes: 1,105 additions & 570 deletions generate/input/libgit2-docs.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion generate/scripts/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ var cTypeMappings = {
"size_t": "Number",
"uint16_t": "Number",
"uint32_t": "Number",
"uint64_t": "Number"
"uint64_t": "Number",
"double": "Number"
}

var collisionMappings = {
Expand Down
8 changes: 5 additions & 3 deletions test/tests/note.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@ describe("Note", function() {
var noteRef = "refs/notes/commits";
var sig = Signature.create("John", "[email protected]", Date.now(), 0);

return Note.remove(this.repository, noteRef, sig, sig, sha)
return Note.create(this.repository, noteRef, sig, sig, sha, "Testing!", 1)
.then((noteSha) => Note.remove(this.repository, noteRef, sig, sig, sha))
.then(function() {
return Note.read(test.repository, noteRef, sha).catch(function(ex) {
assert.equal(ex.message, "Note could not be found");
assert.equal(ex.message, "note could not be found");
done();
});
});
})
.catch(done);
});
});
2 changes: 1 addition & 1 deletion test/tests/rebase.js
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ describe("Rebase", function() {
"There should not be a rebase in progress");
})
.catch(function(e) {
assert.equal(e.message, "There is no rebase in progress");
assert.equal(e.message, "there is no rebase in progress");
});
})
.then(function() {
Expand Down
17 changes: 10 additions & 7 deletions test/tests/remote.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
var assert = require("assert");
var path = require("path");
var local = path.join.bind(path, __dirname);
var _ = require("lodash");

var garbageCollect = require("../utils/garbage_collect.js");

Expand Down Expand Up @@ -388,13 +389,15 @@ describe("Remote", function() {
// catches linux / osx failure to use anonymous credentials
// stops callback infinite loop
.catch(function (reason) {
if (reason.message !==
"Method push has thrown an error.")
{
throw reason;
} else {
return Promise.resolve();
}
const messageWithoutNewlines = reason.message.replace(/\n|\r/g, "");
const validErrors = [
"Method push has thrown an error.",
"failed to set credentials: The parameter is incorrect."
];
assert.ok(
_.includes(validErrors, messageWithoutNewlines),
"Unexpected error: " + reason.message
);
});
});

Expand Down
2 changes: 1 addition & 1 deletion test/tests/revparse.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ describe("Revparse", function() {
})
.catch(function(error) {
assert.ok(error instanceof Error);
assert.equal(error.message, "Revspec 'INVALID' not found.");
assert.equal(error.message, "revspec 'INVALID' not found");
});
});

Expand Down
2 changes: 1 addition & 1 deletion vendor/libgit2
Submodule libgit2 updated 282 files
25 changes: 19 additions & 6 deletions vendor/libgit2.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,12 @@
"sources": [
"libgit2/include/git2/sys/hashsig.h",
"libgit2/include/git2/sys/merge.h",
"libgit2/include/git2/sys/time.h",
"libgit2/src/annotated_commit.c",
"libgit2/src/annotated_commit.h",
"libgit2/src/array.h",
"libgit2/src/apply.c",
"libgit2/src/apply.h",
"libgit2/src/attr_file.c",
"libgit2/src/attr_file.h",
"libgit2/src/attr.c",
Expand Down Expand Up @@ -73,19 +76,20 @@
"libgit2/src/config.h",
"libgit2/src/crlf.c",
"libgit2/src/date.c",
"libgit2/src/delta-apply.c",
"libgit2/src/delta-apply.h",
"libgit2/src/delta.c",
"libgit2/src/delta.h",
"libgit2/src/diff_driver.c",
"libgit2/src/diff_driver.h",
"libgit2/src/diff_file.c",
"libgit2/src/diff_file.h",
"libgit2/src/diff_patch.c",
"libgit2/src/diff_patch.h",
"libgit2/src/diff_generate.c",
"libgit2/src/diff_generate.h",
"libgit2/src/diff_parse.c",
"libgit2/src/diff_parse.h",
"libgit2/src/diff_print.c",
"libgit2/src/diff_stats.c",
"libgit2/src/diff_tform.c",
"libgit2/src/diff_tform.h",
"libgit2/src/diff_xdiff.c",
"libgit2/src/diff_xdiff.h",
"libgit2/src/diff.c",
Expand Down Expand Up @@ -157,6 +161,12 @@
"libgit2/src/pack.h",
"libgit2/src/path.c",
"libgit2/src/path.h",
"libgit2/src/patch.c",
"libgit2/src/patch.h",
"libgit2/src/patch_generate.c",
"libgit2/src/patch_generate.h",
"libgit2/src/patch_parse.c",
"libgit2/src/patch_parse.h",
"libgit2/src/pathspec.c",
"libgit2/src/pathspec.h",
"libgit2/src/pool.c",
Expand Down Expand Up @@ -236,6 +246,8 @@
"libgit2/src/userdiff.h",
"libgit2/src/util.c",
"libgit2/src/util.h",
"libgit2/src/varint.c",
"libgit2/src/varint.h",
"libgit2/src/vector.c",
"libgit2/src/vector.h",
"libgit2/src/xdiff/xdiff.h",
Expand Down Expand Up @@ -354,8 +366,8 @@
"libgit2/src/win32/posix.h",
"libgit2/src/win32/precompiled.c",
"libgit2/src/win32/precompiled.h",
"libgit2/src/win32/pthread.c",
"libgit2/src/win32/pthread.h",
"libgit2/src/win32/thread.c",
"libgit2/src/win32/thread.h",
"libgit2/src/win32/reparse.h",
"libgit2/src/win32/utf-conv.c",
"libgit2/src/win32/utf-conv.h",
Expand All @@ -372,6 +384,7 @@
"sources": [
"libgit2/src/unix/map.c",
"libgit2/src/unix/posix.h",
"libgit2/src/unix/pthread.h",
"libgit2/src/unix/realpath.c",
],
"cflags": [
Expand Down