Skip to content

chore(git-node): remove abort error in case of fixable error #1099

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 1 commit into from
Jun 23, 2026
+15 −15
Merged

chore(git-node): remove abort error in case of fixable error #1099

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
30 changes: 15 additions & 15 deletions lib/promote_release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,11 +523,7 @@ export default class ReleasePromotion extends Session {
cli.separator();
cli.info('Resolve the conflicts and commit the result');
cli.separator();
const didResolveConflicts = await cli.prompt(
'Finished resolving cherry-pick conflicts?', { defaultAnswer: true });
if (!didResolveConflicts) {
throw new Error('Aborted');
}
await cli.prompt('Ready to continue?', { defaultAnswer: true });
}

if (existsSync('.git/CHERRY_PICK_HEAD')) {
Expand All @@ -537,16 +533,20 @@ export default class ReleasePromotion extends Session {
}

// Validate release commit on the default branch
const releaseCommitOnDefaultBranch =
await forceRunAsync('git', ['show', 'HEAD', '--name-only', '--pretty=format:%s'],
{ captureStdout: true, ignoreFailure: false });
const [commitTitle, ...modifiedFiles] = releaseCommitOnDefaultBranch.trim().split('\n');
await this.validateReleaseCommit(commitTitle);
if (modifiedFiles.some(file => !file.endsWith('.md'))) {
cli.warn('Some modified files are not markdown, that\'s unusual.');
cli.info(`The list of modified files: ${modifiedFiles.map(f => `- ${f}`).join('\n')}`);
if (!await cli.prompt('Do you want to proceed anyway?', { defaultAnswer: false })) {
throw new Error('Aborted');
while (true) {
const releaseCommitOnDefaultBranch =
await forceRunAsync('git', ['show', 'HEAD', '--name-only', '--pretty=format:%s'],
{ captureStdout: true, ignoreFailure: false });
const [commitTitle, ...modifiedFiles] = releaseCommitOnDefaultBranch.trim().split('\n');
await this.validateReleaseCommit(commitTitle);
if (modifiedFiles.some(file => !file.endsWith('.md'))) {
cli.warn('Some modified files are not markdown, that\'s unusual.');
cli.info(`The list of modified files: ${modifiedFiles.map(f => `- ${f}`).join('\n')}`);
if (await cli.prompt('Consider amending the commit before continuing. Ready to continue?', {
defaultAnswer: false
})) {
break;
}
}
}
}
Expand Down
Loading