Merge pull request #698 from bpeabody/fix-pull-rebase-deduction

Fix rebase deduction logic in pull.
twosigma · Mar 26, 2019 · 0479e22 · 0479e22
2 parents fb43980 + f56a670
commit 0479e22
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/node/lib/util/pull.js b/node/lib/util/pull.js
@@ -100,7 +100,7 @@ ${colors.red(source)} in the remote ${colors.yellow(remoteName)}.`);
  * @return bool
  */
 exports.userWantsRebase = co.wrap(function*(args, repo, branch) {
-    if (args.rebase !== undefined) {
+    if (args.rebase !== undefined && args.rebase !== null) {
         return args.rebase;
     }
 

diff --git a/node/test/util/pull.js b/node/test/util/pull.js
@@ -132,6 +132,10 @@ describe("userWantsRebase", function () {
                                                       null,
                                                       null));
 
+        assert.equal(false, yield Pull.userWantsRebase({"rebase": null},
+                                                       repo,
+                                                       master));
+
         assert.equal(false, yield Pull.userWantsRebase({},
                                                        repo,
                                                        master));