Merge 1a87915ac6961de7df28fc4ee1a7eb984e28c7c8 into 598f1826d8b2bc969aace2c6459824737667218c

2026-03-20 21:26:02 -07:00 · 2026-03-20 21:26:02 -07:00 · aee18c16b2
commit aee18c16b2
parent 598f1826d8 1a87915ac6
1 changed files with 1 additions and 1 deletions
--- a/src/infra/update-runner.ts
+++ b/src/infra/update-runner.ts
@ -636,7 +636,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",