nodegit · johnhaley81 · Feb 6, 2017 · Jan 10, 2017 · Jan 10, 2017 · Jan 10, 2017
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -2456,7 +2456,11 @@
      }
    },
    "time": {
-      "dupFunction": "git_time_dup"
+      "dupFunction": "git_time_dup",
+      "dependencies": [
+        "git2/sys/time.h"
+      ]
+
    },
    "trace": {
      "functions": {

diff --git a/generate/input/libgit2-docs.json b/generate/input/libgit2-docs.json
diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -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 = {

diff --git a/test/tests/note.js b/test/tests/note.js
@@ -58,12 +58,14 @@ describe("Note", function() {
    var noteRef = "refs/notes/commits";
    var sig = Signature.create("John", "john@doe.com", 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);
  });
 });
diff --git a/test/tests/rebase.js b/test/tests/rebase.js
@@ -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() {

diff --git a/test/tests/remote.js b/test/tests/remote.js
@@ -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");

@@ -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
+        );
      });
  });


diff --git a/test/tests/revparse.js b/test/tests/revparse.js
@@ -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");
      });
  });


diff --git a/vendor/libgit2 b/vendor/libgit2
diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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": [