Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug causing stale optimistic state in the git panel (#28588)

Browse source 
Release Notes:

- Fixed a bug that caused the staged status of files in the git panel to
be out of date in some cases.
This commit is contained in:
Cole Miller 2025-04-11 13:26:39 -04:00 • committed by GitHub
parent 7caa2c2ea0
commit 66b3e03baa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/project/src/git_store.rs
View file

@ -3796,12 +3796,6 @@ impl Repository {
updates_tx: Option<mpsc::UnboundedSender<DownstreamUpdate>>,
cx: &mut Context<Self>,
) {
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),

14
crates/project_panel/src/project_panel_tests.rs
View file

@ -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();