Skip to content

feat(git-node): suggest abort previous session #1042

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
aduh95 merged 3 commits into from
Mar 27, 2026
Merged

feat(git-node): suggest abort previous session #1042

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5deee7a
feat(git-node): suggest abort previous session
aduh95 Mar 21, 2026
d6102fa
fixup! feat(git-node): suggest abort previous session
aduh95 Mar 21, 2026
5d0fc8d
fixup! feat(git-node): suggest abort previous session
aduh95 Mar 24, 2026
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
8 changes: 5 additions & 3 deletions components/git/land.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ async function main(state, argv, cli, dir) {
cli.warn(
'Failed to detect previous session. ' +
'please run `git node land --abort`');
process.exitCode ||= 1;
Comment thread
aduh95 marked this conversation as resolved.
Outdated
return;
}

Expand All @@ -197,10 +198,11 @@ async function main(state, argv, cli, dir) {
cli.warn(
'Previous `git node land` session for ' +
`${session.pullName} in progress.`);
cli.log('run `git node land --abort` before starting a new session');
return;
const response = await cli.prompt('Do you want to abort it?', { defaultAnswer: false });
if (!response) throw new Error('Please run `git node land --abort`');
await session.abort();
session = new LandingSession(cli, req, dir, argv);
}
session = new LandingSession(cli, req, dir, argv);
const metadata = await getMetadata(session.argv, argv.skipRefs, cli);
if (argv.backport) {
const split = metadata.metadata.split('\n')[0];
Expand Down
Loading