diff --git a/Cargo.lock b/Cargo.lock index 4ce3131d66..3e55bb6f3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3180,7 +3180,6 @@ dependencies = [ "collections", "component", "db", - "futures 0.3.31", "gpui", "languages", "notifications", @@ -3188,7 +3187,6 @@ dependencies = [ "serde", "ui", "ui_input", - "util", "workspace", "workspace-hack", ] diff --git a/crates/project/src/git_store.rs b/crates/project/src/git_store.rs index a2386ad34c..9a1683b379 100644 --- a/crates/project/src/git_store.rs +++ b/crates/project/src/git_store.rs @@ -3796,12 +3796,6 @@ impl Repository { updates_tx: Option>, cx: &mut Context, ) { - self.paths_changed( - vec![git::repository::WORK_DIRECTORY_REPO_PATH.clone()], - updates_tx.clone(), - cx, - ); - let this = cx.weak_entity(); let _ = self.send_keyed_job( Some(GitJobKey::ReloadGitState), diff --git a/crates/project_panel/src/project_panel_tests.rs b/crates/project_panel/src/project_panel_tests.rs index e35e5d25c5..990b446dcb 100644 --- a/crates/project_panel/src/project_panel_tests.rs +++ b/crates/project_panel/src/project_panel_tests.rs @@ -2070,6 +2070,20 @@ async fn test_select_git_entry(cx: &mut gpui::TestAppContext) { cx, ) .await; + + let (scan1_complete, scan2_complete) = project.update(cx, |project, cx| { + let mut worktrees = project.worktrees(cx); + let worktree1 = worktrees.next().unwrap(); + let worktree2 = worktrees.next().unwrap(); + ( + worktree1.read(cx).as_local().unwrap().scan_complete(), + worktree2.read(cx).as_local().unwrap().scan_complete(), + ) + }); + scan1_complete.await; + scan2_complete.await; + cx.run_until_parked(); + let workspace = cx.add_window(|window, cx| Workspace::test_new(project.clone(), window, cx)); let cx = &mut VisualTestContext::from_window(*workspace, cx); let panel = workspace.update(cx, ProjectPanel::new).unwrap();