Finish removing git repository state and scanning logic from worktrees #27568
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cla-bot
bot
added
the
cla-signed
cole-miller
changed the title
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Conrad <conrad@zed.dev>
cole-miller
added a commit
that referenced
this pull request
Apr 2, 2025
This fixes a bug in #27568 that caused flickering in the git panel's checkbox state when staging and unstaging entire files. The problem is that that stage/unstage action first saves the target path (if it's open as a buffer), and we do a targeted git status scan in response to that filesystem event, which makes its way to the git panel and causes it to clear its pending state before the actual stage or unstage has gone through. The fix is to not clear the panel's pending state for git repository events that originated from a targeted scan (i.e. one that was triggered by FS events for repo paths, as opposed to events inside `.git` which cause all statuses to be recomputed). Release Notes: - N/A
cole-miller
added a commit
that referenced
this pull request
Apr 10, 2025
This regressed in #27568, oops. Release Notes: - Fixed a bug causing conflicted files in the git panel to jump to the "Tracked" section as soon as they were staged.
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Apr 10, 2025
This regressed in #27568, oops. Release Notes: - Fixed a bug causing conflicted files in the git panel to jump to the "Tracked" section as soon as they were staged.
gcp-cherry-pick-bot bot
pushed a commit
that referenced
this pull request
Apr 10, 2025
This regressed in #27568, oops. Release Notes: - Fixed a bug causing conflicted files in the git panel to jump to the "Tracked" section as soon as they were staged.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR completes the process of moving git repository state storage and scanning logic from the worktree crate to
project::git_store.Release Notes: