From d0c3b33fa2051e32d7afeb89e39977c644e64724 Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Mon, 26 Jan 2026 23:36:31 -0500
Subject: [PATCH] git: Don't rebuild the project diff when the active
 repository changes (#47718)

Release Notes:

- N/A
---
 crates/project/src/git_store/branch_diff.rs | 46 ++++++++++++++-------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/crates/project/src/git_store/branch_diff.rs b/crates/project/src/git_store/branch_diff.rs
index 661c64a57e3b9e53073beb4c7797a8db150ce194..7b64f540e2a0a55b2e29523f3856eb04c600c28e 100644
--- a/crates/project/src/git_store/branch_diff.rs
+++ b/crates/project/src/git_store/branch_diff.rs
@@ -59,17 +59,31 @@ impl BranchDiff {
         cx: &mut Context<Self>,
     ) -> Self {
         let git_store = project.read(cx).git_store().clone();
+        let repo = git_store.read(cx).active_repository();
         let git_store_subscription = cx.subscribe_in(
             &git_store,
             window,
-            move |this, _git_store, event, _window, cx| match event {
-                GitStoreEvent::ActiveRepositoryChanged(_)
-                | GitStoreEvent::RepositoryUpdated(_, RepositoryEvent::StatusesChanged, true)
-                | GitStoreEvent::ConflictsUpdated => {
+            move |this, _git_store, event, _window, cx| {
+                let should_update = match event {
+                    GitStoreEvent::ActiveRepositoryChanged(new_repo_id) => {
+                        this.repo.is_none() && new_repo_id.is_some()
+                    }
+                    GitStoreEvent::RepositoryUpdated(
+                        event_repo_id,
+                        RepositoryEvent::StatusesChanged,
+                        _,
+                    ) => this
+                        .repo
+                        .as_ref()
+                        .is_some_and(|r| r.read(cx).snapshot().id == *event_repo_id),
+                    GitStoreEvent::ConflictsUpdated => this.repo.is_some(),
+                    _ => false,
+                };
+
+                if should_update {
                     cx.emit(BranchDiffEvent::FileListChanged);
                     *this.update_needed.borrow_mut() = ();
                 }
-                _ => {}
             },
         );
 
@@ -78,7 +92,6 @@ impl BranchDiff {
             let this = cx.weak_entity();
             async |cx| Self::handle_status_updates(this, recv, cx).await
         });
-        let repo = git_store.read(cx).active_repository();
 
         Self {
             diff_base: source,
@@ -106,15 +119,18 @@ impl BranchDiff {
         while recv.next().await.is_some() {
             let Ok(needs_update) = this.update(cx, |this, cx| {
                 let mut needs_update = false;
-                let active_repo = this
-                    .project
-                    .read(cx)
-                    .git_store()
-                    .read(cx)
-                    .active_repository();
-                if active_repo != this.repo {
-                    needs_update = true;
-                    this.repo = active_repo;
+
+                if this.repo.is_none() {
+                    let active_repo = this
+                        .project
+                        .read(cx)
+                        .git_store()
+                        .read(cx)
+                        .active_repository();
+                    if active_repo.is_some() {
+                        this.repo = active_repo;
+                        needs_update = true;
+                    }
                 } else if let Some(repo) = this.repo.as_ref() {
                     repo.update(cx, |repo, _| {
                         if let Some(branch) = &repo.branch