Skip to content

Commit

Permalink
fix: fixupAll flag should take precedence over autorebase (#593)
Browse files Browse the repository at this point in the history
When running `git node land <pr> --autorebase --fixupAll`, ncu should
squash all the commits first, then ignore the `--autorebase` flag as
there is only one commit left.

Refs: nodejs/node#40696 (comment)
  • Loading branch information
logictitans committed Nov 17, 2021
1 parent 0abd56b commit 382fa82
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions lib/landing_session.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,12 @@ class LandingSession extends Session {
}

return this.final();
} else if (this.fixupAll) {
cli.log(`There are ${subjects.length} commits in the PR. ` +
'Attempting to fixup everything into first commit.');
await runAsync('git', ['reset', '--soft', `HEAD~${subjects.length - 1}`]);
await runAsync('git', ['commit', '--amend', '--no-edit']);
return await this.amend() && this.final();
} else if (this.autorebase && this.canAutomaticallyRebase(subjects)) {
// Run git rebase in interactive mode with autosquash but without editor
// so that it will perform everything automatically.
Expand All @@ -239,12 +245,6 @@ class LandingSession extends Session {
cli.log(`Couldn't rebase ${count} commits in the PR automatically`);
this.makeRebaseSuggestion(subjects);
}
} else if (this.fixupAll) {
cli.log(`There are ${subjects.length} commits in the PR. ` +
'Attempting to fixup everything into first commit.');
await runAsync('git', ['reset', '--soft', `HEAD~${subjects.length - 1}`]);
await runAsync('git', ['commit', '--amend', '--no-edit']);
return await this.amend() && this.final();
} else {
this.makeRebaseSuggestion(subjects);
}
Expand Down

0 comments on commit 382fa82

Please sign in to comment.