Cleaned up amend commit test

smith-kyle · smith-kyle · commit e0d7e7dd0e9c · 2015-07-21T09:14:32.000-07:00
diff --git a/lib/commit.js b/lib/commit.js
@@ -210,35 +210,30 @@ Commit.prototype.getDiff = function(callback) {
  * @param {Tree|Oid} tree
  * @param {Oid} callback
  */
- var amend = Commit.prototype.amend;
- Commit.prototype.amend = function (
-   updateRef, author, committer, message_encoding, message, tree, callback) {
-     var repo = this.repo;
-     var treeObject = tree;
-     var _this = this;
-
-     if (tree instanceof NodeGit.Oid){
-       return repo.getTree(tree).then(function(result){
-         treeObject = result;
-         return amend.call(_this,
-           updateRef,
-           author,
-           committer,
-           message_encoding,
-           message,
-           treeObject
-         );
-       });
-     } else {
-       return new Promise(amend.call(_this,
-         updateRef,
-         author,
-         committer,
-         message_encoding,
-         message,
-         treeObject
-       ));
-     }
+var amend = Commit.prototype.amend;
+Commit.prototype.amend = function (
+  updateRef, author, committer, message_encoding, message, tree, callback) {
+    var repo = this.repo;
+    var _this = this;
+    var treePromise;
+
+    if (tree instanceof NodeGit.Oid){
+      treePromise = repo.getTree(tree);
+    } else {
+      treePromise = Promise.resolve(tree);
+    }
+
+    return treePromise
+      .then(function(treeObject){
+        return amend.call(_this,
+          updateRef,
+          author,
+          committer,
+          message_encoding,
+          message,
+          treeObject
+        );
+      });
  };
 
 /**
diff --git a/test/tests/commit.js b/test/tests/commit.js
@@ -151,7 +151,7 @@ describe("Commit", function() {
 
   it("can amend commit", function(){
     var commitToAmendId = "315e77328ef596f3bc065d8ac6dd2c72c09de8a5";
-    var expectedAmendedCommitId = "7afb945e108e10d98732963c15682072db99bc28";
+    var expectedAmendedCommitId = "57836e96555243666ea74ea888310cc7c41d4613";
     var fileName = "newfile.txt";
     var fileContent = "hello world";
     var newFileName = "newerfile.txt";
@@ -242,24 +242,23 @@ describe("Commit", function() {
          repo.getCommit(commitToAmendId),
          NodeGit.Signature.create(
            "New Foo Bar",
-           "fizz@buzz.com",
+           "newfoo@bar.com",
            246802468,
            12
          ),
          NodeGit.Signature.create(
            "New Foo A Bar",
-           "fizz@buzz.com",
+           "newfoo@bar.com",
            4807891730,
            32
-         ),
-         repo.getTree(resultOid)
+         )
        ]);
+
     })
     .then(function(amendInfo){
       var commit = amendInfo[0];
       author = amendInfo[1];
       committer = amendInfo[2];
-
       return commit.amend(
         "HEAD",
         author,
