fix test

maxkorp · maxkorp · commit bf2acf98f769 · 2014-12-01T15:23:01.000-07:00
diff --git a/lib/repository.js b/lib/repository.js
@@ -537,19 +537,19 @@ Repository.prototype.mergeBranches = function(to, from) {
   var toBranch;
 
   return Promise.all([
-    repo.getBranch(from),
-    repo.getBranch(to)
+    repo.getBranch(to),
+    repo.getBranch(from)
   ]).then(function(branches) {
-    fromBranch = branches[0];
-    toBranch = branches[1];
+    toBranch = branches[0];
+    fromBranch = branches[1];
 
     return Promise.all([
-      repo.getBranchCommit(fromBranch),
-      repo.getBranchCommit(toBranch)
+      repo.getBranchCommit(toBranch),
+      repo.getBranchCommit(fromBranch)
     ]);
   }).then(function(branchCommits) {
-    var fromCommitOid = branchCommits[0].toString();
-    var toCommitOid = branchCommits[1].toString();
+    var toCommitOid = branchCommits[0].toString();
+    var fromCommitOid = branchCommits[1].toString();
 
     return NodeGit.Merge.base(repo, toCommitOid, fromCommitOid)
     .then(function(baseCommit) {
@@ -592,10 +592,11 @@ Repository.prototype.mergeBranches = function(to, from) {
             fromBranch.shorthand() +
             " into " +
             toBranch.shorthand();
+            console.log(message);
           var sig = repo.defaultSignature();
 
           return repo.createCommit(
-            toBranch.shorthand(),
+            toBranch.name(),
             sig,
             sig,
             message,
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -225,7 +225,7 @@ describe("Merge", function() {
     });
   });
 
-  it.only("can merge using the convenience method", function() {
+  it.only("can merge cleanly using the convenience method", function() {
     var initialFileName = "initialFile.txt";
     var ourFileName = "ourNewFile.txt";
     var theirFileName = "theirNewFile.txt";
@@ -303,11 +303,11 @@ describe("Merge", function() {
       "af60aa06b3537f75b427f6268a130c842c84a137");
 
       return repository.createCommit(ourBranch.name(), ourSignature,
-      ourSignature, "we made a commit", oid, [initialCommit]);
+        ourSignature, "we made a commit", oid, [initialCommit]);
     })
     .then(function(commitOid) {
       assert.equal(commitOid.toString(),
-      "7ce31c05427659986d50abfb90c8f7db88ef4fa1");
+        "7ce31c05427659986d50abfb90c8f7db88ef4fa1");
 
       return repository.getCommit(commitOid).then(function(commit) {
         ourCommit = commit;
@@ -343,7 +343,7 @@ describe("Merge", function() {
       });
     })
     .then(function() {
-      return repository.mergeBranches(theirBranchName, ourBranchName);
+      return repository.mergeBranches(ourBranchName, theirBranchName);
     })
     .then(function(commitId) {
       assert.equal(commitId.toString(),
