fix: do not run git cherry-pick --abort on failure

[aduh95]

I personally find it useful to keep the cherry-pick session as is to help with debugging what's going wrong.

[codecov]

Codecov Report

Base: 83.41% // Head: 83.41% // No change to project coverage 👍

Coverage data is based on head (0d5cdd5) compared to base (6926407).
Patch has no changes to coverable lines.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #671   +/-   ##
=======================================
  Coverage   83.41%   83.41%           
=======================================
  Files          37       37           
  Lines        4136     4136           
=======================================
  Hits         3450     3450           
  Misses        686      686           

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

[targos]

This is to help manual landing? Is it going to change something for CQ landing?

[aduh95]

This is to help manual landing?

Correct, e.g. when a PR contains merge commits.

Is it going to change something for CQ landing?

It should not, because the CQ runs git node land --abort after each failed attempt, and that would reset any git cherry-pick session:

node-core-utils/lib/session.js

Lines 278 to 289 in 6926407

	async tryAbortCherryPick() {
	const { cli } = this;
	if (!this.cherryPickInProgress()) {
	return cli.ok('No git cherry-pick in progress');
	}
	const shouldAbortCherryPick = await cli.prompt(
	'Abort previous git cherry-pick sessions?');
	if (shouldAbortCherryPick) {
	await forceRunAsync('git', ['cherry-pick', '--abort']);
	cli.ok('Aborted previous git cherry-pick sessions');
	}
	}