From ffe503d77c523ea6a91a890245e2a1092a56161d Mon Sep 17 00:00:00 2001
From: Cole Miller <cole@zed.dev>
Date: Wed, 5 Feb 2025 13:41:08 -0500
Subject: [PATCH] Fix spurious addition hunks in files with no git repo
 (#24288)

Release Notes:

- N/A
---
 crates/editor/src/editor.rs     | 6 ++----
 crates/worktree/src/worktree.rs | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index dab3ef5d71..6304a56b66 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -14478,10 +14478,8 @@ fn get_uncommitted_changes_for_buffer(
         let change_sets = futures::future::join_all(tasks).await;
         buffer
             .update(&mut cx, |buffer, cx| {
-                for change_set in change_sets {
-                    if let Some(change_set) = change_set.log_err() {
-                        buffer.add_change_set(change_set, cx);
-                    }
+                for change_set in change_sets.into_iter().flatten() {
+                    buffer.add_change_set(change_set, cx);
                 }
             })
             .ok();
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index cc6075f07a..c87187a32e 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -886,7 +886,7 @@ impl Worktree {
                             }
                         }
                     }
-                    Ok(None)
+                    Err(anyhow!("No repository found for {path:?}"))
                 })
             }
             Worktree::Remote(_) => {
@@ -910,7 +910,7 @@ impl Worktree {
                             }
                         }
                     }
-                    Ok(None)
+                    Err(anyhow!("No repository found for {path:?}"))
                 })
             }
             Worktree::Remote(_) => Task::ready(Err(anyhow!(