Infra: catch rebase --abort failure to prevent stuck repo state

2026-03-03 21:12:56 -05:00 · 2026-03-03 21:12:56 -05:00 · 9de2e83a31
commit 9de2e83a31
parent dc4441322f
1 changed files with 1 additions and 1 deletions
--- a/src/infra/update-runner.ts
+++ b/src/infra/update-runner.ts
@ -631,7 +631,7 @@ export async function runGatewayUpdate(opts: UpdateRunnerOptions = {}): Promise<
        const abortResult = await runCommand(["git", "-C", gitRoot, "rebase", "--abort"], {
          cwd: gitRoot,
          timeoutMs,
-        });
+        }).catch(() => ({ stdout: "", stderr: "rebase --abort failed", code: -1 }));
        steps.push({
          name: "git rebase --abort",
          command: "git rebase --abort",