From 9de2e83a31c19ea3335df250218a5c4a0f58c381 Mon Sep 17 00:00:00 2001
From: Jie Lin <jielin@home.local>
Date: Tue, 3 Mar 2026 21:12:56 -0500
Subject: [PATCH] Infra: catch rebase --abort failure to prevent stuck repo
 state

---
 src/infra/update-runner.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/infra/update-runner.ts b/src/infra/update-runner.ts
index 5b1e31512da..815024621cd 100644
--- 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",