Skip to content

land: fix --abort exit status code #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2020
Merged

land: fix --abort exit status code #449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions lib/landing_session.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ class LandingSession extends Session {
const shouldContinue = await cli.prompt(
`This PR ${status} to land, do you want to continue?`, { defaultAnswer });
if (!shouldContinue) {
cli.setExitCode(1);
return this.abort(false);
}

Expand All @@ -47,13 +48,19 @@ class LandingSession extends Session {
}

async abort(tryResetBranch = true) {
const { cli } = this;
this.cleanFiles();
if (tryResetBranch) {
await this.tryResetBranch();
try {
const { cli } = this;
this.cleanFiles();
if (tryResetBranch) {
await this.tryResetBranch();
}
cli.ok(`Aborted \`git node land\` session in ${this.ncuDir}`);
} catch (ex) {
const { cli } = this;
cli.setExitCode(1);
cli.error(`Couldn't abort \`git node land\` session in ${this.ncuDir}`);
throw ex;
}
cli.ok(`Aborted \`git node land\` session in ${this.ncuDir}`);
cli.setExitCode(1);
}

async downloadAndPatch() {
Expand Down