Fix merge command

twosigma · Feb 15, 2019 · 3db6a40 · 3db6a40
1 parent 1818721
commit 3db6a40
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/node/lib/cmd/merge.js b/node/lib/cmd/merge.js
@@ -170,6 +170,7 @@ Merge of '${commitName}'
     };
     const commit = yield repo.getCommit(commitish.id());
     const result = yield MergeUtil.merge(repo,
+                                         null,
                                          commit,
                                          mode,
                                          Open.SUB_OPEN_OPTION.ALLOW_BARE,

diff --git a/node/lib/cmd/merge_bare.js b/node/lib/cmd/merge_bare.js
@@ -119,12 +119,14 @@ Could not resolve ${colors.red(theirCommitName)} to a commit.`);
 
     const ourCommit = yield repo.getCommit(ourCommitish.id());
     const theirCommit = yield repo.getCommit(theirCommitish.id());
+    const noopEditor = function() {};
     const result = yield MergeUtil.merge(repo,
                                          ourCommit,
                                          theirCommit,
                                          mode,
                                          Open.SUB_OPEN_OPTION.FORCE_BARE,
-                                         args.message);
+                                         args.message,
+                                         noopEditor);
     if (null !== result.errorMessage) {
         throw new UserError(result.errorMessage);
     }