git: Avoid unnecessary git repo rescans when unrelated git files change by lgeiger · Pull Request #59318 · zed-industries/zed

lgeiger · 2026-06-14T21:59:28Z

Objective

Zed triggers many git rescans whenever an outside git command modifies files inside .git dir. This becomes especially problematic when working on large repos or doing remote development on machines with slow filesystems.

Solution

Events for object writes, hook files, lock files, and the reflogs of HEAD/branches/remote-tracking branches carry no git changes that Zed cares about beyond what the ref or events already cover. So changes to these files shouldn't trigger a full git rescan.

Testing

I extended the existing unittests to add the additionally ignored directories and lock files.
I also manually verified the changes by viewing the zed git debug logs that get generated when running git gc on a freshly gc'ed repo. Previously Zed triggered 7 worktree updates, with these changes it was reduced to a single worktree update which is due to .git/packed-refs which we can't ignore.

main:

2026-06-13T13:56:52+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:52+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:52+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

2026-06-13T13:56:53+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:53+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:53+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

2026-06-13T13:56:54+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:54+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:54+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:54+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-13T13:56:56+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-13T13:56:56+01:00 DEBUG [project::git_store] fetched remotes
2026-06-13T13:56:56+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-13T13:56:56+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-13T13:56:56+01:00 DEBUG [project::git_store] load merge details
2026-06-13T13:56:56+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

This PR:

2026-06-15T01:19:51+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }]
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] local worktree repos changed
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] run scheduled git status scan
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] starting compute snapshot
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] fetched remotes
2026-06-15T01:19:51+01:00 DEBUG [git::repository] Checking for git status in [""]
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] load merge details
2026-06-15T01:19:51+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }

Self-Review Checklist:

I've reviewed my own diff for quality, security, and reliability
Unsafe blocks (if any) have justifying comments
The content adheres to Zed's UI standards (UX/UI and icon guidelines)
Tests cover the new/changed behavior
Performance impact has been considered and is acceptable

Release Notes:

Reduced number of git operations when repository state changes outside of zed

lgeiger · 2026-06-14T21:59:52Z

+pub const LOGS_REFS_HEADS_DIR: &str = "logs/refs/heads";
+pub const LOGS_REFS_REMOTES_DIR: &str = "logs/refs/remotes";
 pub const COMMIT_MESSAGE: &str = "COMMIT_EDITMSG";
-pub const INDEX_LOCK: &str = "index.lock";


We now ignore all *.lock files

lgeiger · 2026-06-15T00:22:59Z

+pub const REBASE_MERGE_DIR: &str = "rebase-merge";
+pub const REBASE_APPLY_DIR: &str = "rebase-apply";
+pub const SEQUENCER_DIR: &str = "sequencer";


These specific ignores have been found by Gemini, but I think that's correct since git only writes intermediate state to these files

generated by git

they are allowed branch suffixes

lgeiger · 2026-06-15T14:42:19Z

As a followup PR we could further improve this by only triggering the relevant rescans in compute_snapshot depending on which files have changed, such that we don't need to do a full re-scan every time something in .git/ changes. This would probably require a few more code changes. Let me know if that sounds like something that would be useful. I'm happy to send a PR.

cole-miller

Thanks!

maxbrunsfeld · 2026-06-22T16:23:26Z

Great job @lgeiger

…ge (zed-industries#59318) # Objective Zed triggers many git rescans whenever an outside git command modifies files inside `.git` dir. This becomes especially problematic when working on large repos or doing remote development on machines with slow filesystems. ## Solution Events for object writes, hook files, lock files, and the reflogs of HEAD/branches/remote-tracking branches carry no git changes that Zed cares about beyond what the ref or events already cover. So changes to these files shouldn't trigger a full git rescan. ## Testing I extended the existing unittests to add the additionally ignored directories and lock files. I also manually verified the changes by viewing the zed git debug logs that get generated when running `git gc` on a freshly gc'ed repo. Previously Zed triggered **7 worktree updates**, with these changes it was reduced to **a single worktree update** which is due to `.git/packed-refs` which we can't ignore. **main:** ``` 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:52+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:52+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:53+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:53+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } 2026-06-13T13:56:54+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:54+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:54+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:54+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:55+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-13T13:56:55+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-13T13:56:56+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-13T13:56:56+01:00 DEBUG [project::git_store] fetched remotes 2026-06-13T13:56:56+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-13T13:56:56+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-13T13:56:56+01:00 DEBUG [project::git_store] load merge details 2026-06-13T13:56:56+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None } ``` **This PR:** ``` 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] received worktree update for repositories: [UpdatedGitRepository { work_directory_id: ProjectEntryId(0), old_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), new_work_directory_abs_path: Some("/Users/lgeiger/code/zed"), dot_git_abs_path: Some("/Users/lgeiger/code/zed/.git"), repository_dir_abs_path: Some("/Users/lgeiger/code/zed/.git"), common_dir_abs_path: Some("/Users/lgeiger/code/zed/.git") }] 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] local worktree repos changed 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] run scheduled git status scan 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] starting compute snapshot 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] fetched branches, head commit, worktrees 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] fetched remotes 2026-06-15T01:19:51+01:00 DEBUG [git::repository] Checking for git status in [""] 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] fetched statuses, diff stats, stash entries 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] load merge details 2026-06-15T01:19:51+01:00 DEBUG [project::git_store] new merge details: MergeDetails { merge_heads_by_conflicted_path: {}, message: None }``` ## Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [x] Unsafe blocks (if any) have justifying comments - [x] The content adheres to Zed's UI standards ([UX/UI](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist) and [icon](https://github.com/zed-industries/zed/blob/main/crates/icons/README.md) guidelines) - [x] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Release Notes: - Reduced number of git operations when repository state changes outside of zed

Avoid unnecessary git repo rescans when unrelated git files change

5af43bb

cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Jun 14, 2026

lgeiger commented Jun 14, 2026

View reviewed changes

lgeiger changed the title ~~Avoid unnecessary git repo rescans when unrelated git files change~~ git: Avoid unnecessary git repo rescans when unrelated git files change Jun 14, 2026

lgeiger added 3 commits June 15, 2026 00:25

Ignore some more git files/dirs

27b915c

Ignore gc.pid and similar

bc30bea

Ignore full info/ dir

1deea35

lgeiger commented Jun 15, 2026

View reviewed changes

lgeiger added 2 commits June 15, 2026 01:41

Make gc.pid ignore explicit since it seems like it's the only .pid file

306c6ef

generated by git

Only ignore changes to *.new and *.tmp files in the top level dir since

b666bbb

they are allowed branch suffixes

Veykril requested a review from cole-miller June 15, 2026 07:05

Veykril assigned cole-miller Jun 15, 2026

MrSubidubi added the area:integrations/git Git integration feedback label Jun 15, 2026

github-project-automation Bot added this to Git board Jun 15, 2026

cole-miller approved these changes Jun 16, 2026

View reviewed changes

cole-miller added this pull request to the merge queue Jun 16, 2026

Merged via the queue into zed-industries:main with commit 2408640 Jun 16, 2026
43 checks passed

lgeiger deleted the reduce-git-rescan-events branch June 16, 2026 14:19

This was referenced Jun 18, 2026

fix/commit author #59516

Closed

fix/linked images clickable #59518

Closed

github-actions Bot mentioned this pull request Jun 24, 2026

Review upstream Zed v1.8.2 neozed-industries/neo-zed#46

Open

github-actions Bot mentioned this pull request Jul 1, 2026

Review upstream Zed v1.9.0 neozed-industries/neo-zed#47

Open

NeelChotai mentioned this pull request Jul 8, 2026

project: Explicitly scan on git reset and fetch #60590

Merged

This was referenced Jul 8, 2026

Review upstream Zed v1.10.0 neozed-industries/neo-zed#48

Open

Review upstream Zed v1.10.2 neozed-industries/neo-zed#49

Open

Review upstream Zed v1.10.3 neozed-industries/neo-zed#50

Open

Navigation Menu

Uh oh!

Uh oh!

git: Avoid unnecessary git repo rescans when unrelated git files change - #59318

git: Avoid unnecessary git repo rescans when unrelated git files change#59318
cole-miller merged 6 commits into
zed-industries:mainfrom
lgeiger:reduce-git-rescan-events

lgeiger commented Jun 14, 2026 •

edited

Loading

Uh oh!

lgeiger Jun 14, 2026 •

edited

Loading

Uh oh!

lgeiger Jun 15, 2026

Uh oh!

lgeiger commented Jun 15, 2026

Uh oh!

cole-miller left a comment

Uh oh!

Uh oh!

maxbrunsfeld commented Jun 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Uh oh!

Conversation

lgeiger commented Jun 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Objective

Solution

Testing

Self-Review Checklist:

Uh oh!

lgeiger Jun 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lgeiger Jun 15, 2026

Choose a reason for hiding this comment

Uh oh!

lgeiger commented Jun 15, 2026

Uh oh!

cole-miller left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

maxbrunsfeld commented Jun 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lgeiger commented Jun 14, 2026 •

edited

Loading

lgeiger Jun 14, 2026 •

edited

Loading