git: Retain "since" diffs in the GitStore#47619
Merged
cole-miller merged 2 commits intomainfrom Jan 27, 2026
Merged
Conversation
42f22b6 to
193f93f
Compare
cole-miller
added a commit
that referenced
this pull request
Feb 4, 2026
#48388) This regressed in #47619 -- previously we would throw away and reopen the diffs used to construct the branch diff pretty eagerly, and as a result the branch diff would update itself when you committed or switched branches. We inadvertently lost that when we switched to retaining those diffs in the git store. Release Notes: - N/A
adb-sh
pushed a commit
to adb-sh/zed
that referenced
this pull request
Feb 5, 2026
zed-industries#48388) This regressed in zed-industries#47619 -- previously we would throw away and reopen the diffs used to construct the branch diff pretty eagerly, and as a result the branch diff would update itself when you committed or switched branches. We inadvertently lost that when we switched to retaining those diffs in the git store. Release Notes: - N/A
rtfeldman
pushed a commit
that referenced
this pull request
Feb 5, 2026
#48388) This regressed in #47619 -- previously we would throw away and reopen the diffs used to construct the branch diff pretty eagerly, and as a result the branch diff would update itself when you committed or switched branches. We inadvertently lost that when we switched to retaining those diffs in the git store. Release Notes: - N/A
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
1 participant
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 makes it so that
open_diff_since, as used by the branch diff, is able to return a stable diff entity instead of creating a new one every time this is called. In particular, the base text buffer for this diff is now stable across branch diff refreshes, making it usable with the side-by-side view. The strategy for keeping the diff entities alive is the same one that we use for the uncommitted and unstaged diffs--theGitStoreonly holds a weak pointer to each "since" diff, so when these diffs are no longer in use by the branch diff multibuffer they can be cleaned up.Release Notes: