Properly update the index on Merge FF

orderedlist · orderedlist · commit a4a4c8b66bac · 2015-03-22T10:28:56.000-07:00
diff --git a/lib/repository.js b/lib/repository.js
@@ -661,15 +661,18 @@ Repository.prototype.mergeBranches = function(to, from, signature) {
   var repo = this;
   var fromBranch;
   var toBranch;
+  var headCommit;
 
   signature = signature || repo.defaultSignature();
 
   return Promise.all([
     repo.getBranch(to),
-    repo.getBranch(from)
-  ]).then(function(branches) {
-    toBranch = branches[0];
-    fromBranch = branches[1];
+    repo.getBranch(from),
+    repo.getHeadCommit()
+  ]).then(function(objects) {
+    toBranch = objects[0];
+    fromBranch = objects[1];
+    headCommit = objects[2];
 
     return Promise.all([
       repo.getBranchCommit(toBranch),
@@ -694,13 +697,26 @@ Repository.prototype.mergeBranches = function(to, from, signature) {
           " to branch " +
           fromBranch.shorthand();
 
-        return toBranch.setTarget(
-          fromCommitOid,
-          signature,
-          message)
+        return branchCommits[1].getTree()
+        .then(function(tree) {
+          if (headCommit.toString() == toCommitOid) {
+            // Checkout the tree if we're on the branch
+            var opts = {checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE};
+            return NodeGit.Checkout.tree(repo, tree, opts);
+          } else {
+            // Otherwise, just point the ref
+            return;
+          }
+        })
         .then(function() {
-          return fromCommitOid;
-        });
+          return toBranch.setTarget(
+            fromCommitOid,
+            signature,
+            message)
+          .then(function() {
+            return fromCommitOid;
+          });
+        })
       }
       else {
         // We have to merge. Lets do it!
