From 7a5ccd33102a262cf120b294d18330b441800b63 Mon Sep 17 00:00:00 2001
From: Julius Marminge <julius0216@outlook.com>
Date: Mon, 2 Mar 2026 19:54:01 -0800
Subject: [PATCH] Fix toast follow-up actions to avoid re-branching

Co-authored-by: codex <codex@users.noreply.github.com>
---
 apps/web/src/components/GitActionsControl.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index f0819bb22e2108381e13f9bee70f69de716d717f..654ccc2aaea1bf9c63ff84c5d18ff962dacb618a 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -347,7 +347,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
                       action: "commit_push",
                       forcePushOnlyProgress: true,
                       onConfirmed: closeResultToast,
-                      featureBranch,
+                      ...(featureBranch ? { skipDefaultBranchPrompt: true } : {}),
                     });
                   },
                 },
@@ -373,7 +373,7 @@ export default function GitActionsControl({ gitCwd, activeThreadId }: GitActions
                         void runGitActionWithToast({
                           action: "commit_push_pr",
                           forcePushOnlyProgress: true,
-                          featureBranch,
+                          ...(featureBranch ? { skipDefaultBranchPrompt: true } : {}),
                         });
                       },
                     },
-- 
2.54.0