Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! fix: add a specific error message for the commit queue
  • Loading branch information
aduh95 committed Jul 31, 2022
commit c04f593530ca91108a489bb67f1a7b8454d7b682
12 changes: 6 additions & 6 deletions lib/landing_session.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,13 @@ export default class LandingSession extends Session {

if (!forceLand) {
cli.info(
'GITHUB_ACTION' in process.env ?

'Add `commit-queue-squash` label to land the PR as one commit, or ' +
'`commit-queue-rebase` to land as separate commits.' :
'GITHUB_ACTION' in process.env

'Use --fixupAll option, squash the PR manually or land the PR from ' +
'the command line.'
? 'Add `commit-queue-squash` label to land the PR as one commit, ' +
'or `commit-queue-rebase` to land as separate commits.'

: 'Use --fixupAll option, squash the PR manually or land the PR ' +
'from the command line.'
);
process.exit(1);
}
Expand Down