From ffcc144a7599a412aaf53bc8dabce1de019a8495 Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Sat, 18 Apr 2026 19:02:14 -0700
Subject: [PATCH] fix(source-control): do not reset defaultBaseRef on worktree
 switch (#811)

The defaultBaseRef resolver is repo-scoped, not worktree-scoped. Resetting
it to 'origin/main' on every worktree switch within the same repo clobbered
the correct value (e.g. 'origin/master'), causing persistent 'Branch compare
unavailable' errors.
---
 .../src/components/right-sidebar/SourceControl.tsx        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/components/right-sidebar/SourceControl.tsx b/src/renderer/src/components/right-sidebar/SourceControl.tsx
index b1429f5ccac..a334dd38040 100644
--- a/src/renderer/src/components/right-sidebar/SourceControl.tsx
+++ b/src/renderer/src/components/right-sidebar/SourceControl.tsx
@@ -274,7 +274,13 @@ function SourceControlInner(): React.JSX.Element {
     setScope('all')
     setCollapsedSections(new Set())
     setBaseRefDialogOpen(false)
-    setDefaultBaseRef('origin/main')
+    // Why: do NOT reset defaultBaseRef here. It is repo-scoped, not
+    // worktree-scoped, and is resolved by the effect above on activeRepo
+    // change. Resetting it to a hard-coded 'origin/main' on every worktree
+    // switch within the same repo clobbered the correct value (e.g.
+    // 'origin/master' for repos whose default branch isn't main), causing
+    // a persistent "Branch compare unavailable" until the user switched
+    // repos and back to re-trigger the resolver.
     setFilterQuery('')
     setIsExecutingBulk(false)
   }, [activeWorktreeId])