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

Fix stale git statuses (#27735)

Browse source 
Display of git statuses in the git panel, project panel, and tabs
regressed in #27391, causing us to frequently see stale statuses. This
turns out to be because we were not emitting the
`WorktreeUpdatedGitRepositories` event in cases where we should be,
which in turn is because of bumping the `LocalRepositoryEntry`'s
`status_scan_id` too early, so that a later comparison of two
`status_scan_id` values wasn't detecting a change that we're expecting
it to detect.

Release Notes:

- N/A (problematic behavior didn't make it into stable or preview)
This commit is contained in:
Cole Miller 2025-03-29 22:50:09 -04:00 • committed by GitHub
parent 548a8d75e6
commit 9f8776d1af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/worktree/src/worktree.rs
View file

@ -5061,11 +5061,10 @@ impl BackgroundScanner {
); );
if let Some(work_directory_id) = work_directory_id { if let Some(work_directory_id) = work_directory_id {
let scan_id = state.snapshot.scan_id;
state.snapshot.git_repositories.update( state.snapshot.git_repositories.update(
&work_directory_id, &work_directory_id,
|local_repository_entry| { |local_repository_entry| {
local_repository_entry.status_scan_id = scan_id; local_repository_entry.status_scan_id += 1;
}, },
); );
} }
@ -5346,7 +5345,6 @@ impl BackgroundScanner {
&local_repository.work_directory_id, &local_repository.work_directory_id,
|entry| { |entry| {
entry.git_dir_scan_id = scan_id; entry.git_dir_scan_id = scan_id;
entry.status_scan_id = scan_id;
}, },
); );
if let Some(repo_entry) = state if let Some(repo_entry) = state