project: Fix spurious git diff for symlinked files (#58655) (cherry-pick to preview) - #58679
Merged
Merged
Conversation
Opening a symlinked file showed the whole file as changed in the git gutter/diff. Git stores only the symlink's target path as that entry's blob, while the buffer holds the resolved target's contents, so diffing the two is meaningless. We now skip loading a git diff base whenever a buffer's worktree entry is a symlink i.e. its `canonical_path` is set. Release Notes: - Fixed symlinked files showing the entire file as changed in the git diff/gutter.
cla-bot
Bot
added
the
cla-signed
Contributor
|
@zed-zippy approve |
liusuren123
pushed a commit
to liusuren123/zed
that referenced
this pull request
Jun 24, 2026
) (cherry-pick to preview) (zed-industries#58679) Cherry-pick of zed-industries#58655 to preview ---- Opening a symlinked file showed the whole file as changed in the git gutter/diff. Git stores only the symlink's target path as that entry's blob, while the buffer holds the resolved target's contents, so diffing the two is meaningless. We now skip loading a git diff base whenever a buffer's worktree entry is a symlink i.e. its `canonical_path` is set. Release Notes: - Fixed symlinked files showing the entire file as changed in the git diff/gutter. Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
) (cherry-pick to preview) (zed-industries#58679) Cherry-pick of zed-industries#58655 to preview ---- Opening a symlinked file showed the whole file as changed in the git gutter/diff. Git stores only the symlink's target path as that entry's blob, while the buffer holds the resolved target's contents, so diffing the two is meaningless. We now skip loading a git diff base whenever a buffer's worktree entry is a symlink i.e. its `canonical_path` is set. Release Notes: - Fixed symlinked files showing the entire file as changed in the git diff/gutter. Co-authored-by: Smit Barmase <heysmitbarmase@gmail.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of #58655 to preview
Opening a symlinked file showed the whole file as changed in the git
gutter/diff. Git stores only the symlink's target path as that entry's
blob, while the buffer holds the resolved target's contents, so diffing
the two is meaningless.
We now skip loading a git diff base whenever a buffer's worktree entry
is a symlink i.e. its
canonical_pathis set.Release Notes:
diff/gutter.