git: Prevent panic when updating excerpts in split diff (#49725) (cherry-pick to preview)#49729
Merged
zed-zippy[bot] merged 1 commit intov0.225.xfrom Feb 20, 2026
Merged
Conversation
When using the split view, if the project diff inserts excerpts for the same buffer using two different `PathKey`s, we panic inside `LhsEditor::update_path_excerpts_from_rhs` because of an implicit assumption that `excerpts_for_path()` and `excerpts_for_buffer()` return the same number of values. This PR addresses that by ignoring any excerpts for the given buffer that have a different path key from the provided one. Release Notes: - Fixed a crash when using the split diff view. Co-authored-by: Jakub Konka <kubkon@jakubkonka.com> Co-authored-by: Eric <eric@zed.dev>
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.
Cherry-pick of #49725 to preview
When using the split view, if the project diff inserts excerpts for the
same buffer using two different
PathKeys, we panic insideLhsEditor::update_path_excerpts_from_rhsbecause of an implicitassumption that
excerpts_for_path()andexcerpts_for_buffer()returnthe same number of values. This PR addresses that by ignoring any
excerpts for the given buffer that have a different path key from the
provided one.
Release Notes:
Co-authored-by: Jakub Konka kubkon@jakubkonka.com
Co-authored-by: Eric eric@zed.dev