update merge method to take in signature

maxkorp · maxkorp · commit fb6314aea49b · 2014-12-01T15:33:26.000-07:00
diff --git a/lib/repository.js b/lib/repository.js
@@ -60,9 +60,9 @@ function(name, commit, force, signature, logMessage) {
  * @return {Ref}
  */
 Repository.prototype.getBranch = function(name, callback) {
-  name = name instanceof Reference || ~name.indexOf("refs/heads/")
-    ? name
-    : "refs/heads/" + name;
+  name = (name instanceof Reference ||
+     ~name.indexOf("refs/heads/")) ? name
+      : "refs/heads/" + name;
 
   return this.getReference(name).then(function(reference) {
     if (typeof callback === "function") {
@@ -531,11 +531,13 @@ Repository.prototype.fetchAll = function() {
  * @return {Oid|Index}  A commit id for a succesful merge or an index for a
  *                      merge with conflicts
  */
-Repository.prototype.mergeBranches = function(to, from) {
+Repository.prototype.mergeBranches = function(to, from, signature) {
   var repo = this;
   var fromBranch;
   var toBranch;
 
+  signature = signature || repo.defaultSignature();
+
   return Promise.all([
     repo.getBranch(to),
     repo.getBranch(from)
@@ -568,7 +570,7 @@ Repository.prototype.mergeBranches = function(to, from) {
 
         return toBranch.setTarget(
           fromCommitOid,
-          repo.defaultSignature(),
+          signature,
           message)
         .then(function() {
           return fromCommitOid;
@@ -593,12 +595,11 @@ Repository.prototype.mergeBranches = function(to, from) {
             " into " +
             toBranch.shorthand();
             console.log(message);
-          var sig = repo.defaultSignature();
 
           return repo.createCommit(
             toBranch.name(),
-            sig,
-            sig,
+            signature,
+            signature,
             message,
             oid,
             [toCommitOid, fromCommitOid]);
diff --git a/test/tests/merge.js b/test/tests/merge.js
@@ -219,13 +219,14 @@ describe("Merge", function() {
       assert.equal(oid.toString(),
       "0e9231d489b3f4303635fc4b0397830da095e7e7");
 
-      return repository.getBranchCommit(ourBranchName).then(function(branchCommit) {
-        assert.equal(oid.toString(), branchCommit.toString());
-      });
+      return repository.getBranchCommit(ourBranchName)
+        .then(function(branchCommit) {
+          assert.equal(oid.toString(), branchCommit.toString());
+        });
     });
   });
 
-  it.only("can merge cleanly using the convenience method", function() {
+  it("can merge cleanly using the convenience method", function() {
     var initialFileName = "initialFile.txt";
     var ourFileName = "ourNewFile.txt";
     var theirFileName = "theirNewFile.txt";
@@ -343,11 +344,12 @@ describe("Merge", function() {
       });
     })
     .then(function() {
-      return repository.mergeBranches(ourBranchName, theirBranchName);
+      return repository.mergeBranches(ourBranchName, theirBranchName,
+        ourSignature);
     })
     .then(function(commitId) {
       assert.equal(commitId.toString(),
-      "0e9231d489b3f4303635fc4b0397830da095e7e7");
+      "5384feb481d9c29081b3a0c1478fcc24a3953efa");
     });
   });
 
