Allow update_ref to be null

srajko · srajko · commit 278d269e43c2 · 2015-08-31T13:10:49.000-07:00
libgit2 allows this parameter to be null
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -360,6 +360,9 @@
             },
             "tree": {
               "isOptional": true
+            },
+            "update_ref": {
+              "isOptional": true
             }
           }
         },
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -277,6 +277,59 @@ describe("Commit", function() {
     });
   });
 
+  it("can amend commit and update reference separately", function() {
+    var customReflogMessage = "updating reference manually";
+
+    var head, repo, oid, originalReflogCount;
+
+    return NodeGit.Repository.open(reposPath)
+    .then(function(repoResult) {
+      repo = repoResult;
+      // grab the original reflog entry count (to make sure .amend
+      // doesn't add a reflog entry when not given a reference)
+      return NodeGit.Reflog.read(repo, "HEAD");
+    })
+    .then(function(reflog) {
+      originalReflogCount = reflog.entrycount();
+      // get the head reference and commit
+      return repo.head();
+    })
+    .then(function(headResult) {
+      head = headResult;
+      return repo.getHeadCommit();
+    })
+    .then(function(headCommit) {
+      // amend the commit but don't update any reference
+      // (passing null as update_ref)
+      return headCommit.amend(
+        null,
+        null,
+        null,
+        "message",
+        null,
+        null);
+    }).then(function(oidResult) {
+      oid = oidResult;
+      // update the reference manually
+      return head.setTarget(oid, customReflogMessage);
+    }).then(function() {
+      // load reflog and make sure the last message is what we expected
+      return NodeGit.Reflog.read(repo, "HEAD");
+    }).then(function(reflog) {
+      var reflogEntry = reflog.entryByIndex(0);
+      assert.equal(
+        NodeGit.Reflog.entryMessage(reflogEntry),
+        customReflogMessage
+      );
+      assert.equal(
+        NodeGit.Reflog.entryIdNew(reflogEntry).toString(),
+        oid
+      );
+      // only setTarget should have added to the entrycount
+      assert.equal(reflog.entrycount(), originalReflogCount + 1);
+    });
+  });
+
   it("has an owner", function() {
     var owner = this.commit.owner();
     assert.ok(owner instanceof Repository);

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,9 @@`
`360`	`360`	`},`
`361`	`361`	`"tree": {`
`362`	`362`	`"isOptional": true`
	`363`	`+ },`
	`364`	`+ "update_ref": {`
	`365`	`+ "isOptional": true`
`363`	`366`	`}`
`364`	`367`	`}`
`365`	`368`	`},`