Merge pull request #221 from zeebe-io/continue-after-failed-cherry-pick

A failed backport should not prevent the next backport
korthout · Jan 27, 2022 · bc78cfb · bc78cfb
2 parents f2c8506 + 00e3cd6
commit bc78cfb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/git.ts b/src/git.ts
@@ -141,6 +141,7 @@ async function checkout(branch: string, start: string, pwd: string) {
 async function cherryPick(diffrefs: string[], pwd: string) {
   const { exitCode } = await git("cherry-pick", ["-x", ...diffrefs], pwd);
   if (exitCode !== 0) {
+    await git("cherry-pick", ["--abort"], pwd);
     throw new Error(
       `'git cherry-pick -x ${diffrefs}' failed with exit code ${exitCode}`
     );