Skip to content
Permalink
Browse files

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

Fix rebase deduction logic in pull.
  • Loading branch information...
bpeabody committed Mar 26, 2019
2 parents fb43980 + f56a670 commit 0479e2224e2b0621fa849d887957b11e85965a85
Showing with 5 additions and 1 deletion.
  1. +1 −1 node/lib/util/pull.js
  2. +4 −0 node/test/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;
}

@@ -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));

0 comments on commit 0479e22

Please sign in to comment.
You can’t perform that action at this time.