feat: continue after failed cherry-pick

Resets the state after a failed cherry-pick so that one failed backport does not prevent the next backport.
korthout · Jan 27, 2022 · 82595c2 · 82595c2
1 parent f2c8506
commit 82595c2
Showing 1 changed file with 1 addition and 0 deletions.
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}`
     );