Skip to content

git: Fix a panic when searching the split diff#50211

Merged
cole-miller merged 1 commit intomainfrom
fix-split-search
Feb 26, 2026
Merged

git: Fix a panic when searching the split diff#50211
cole-miller merged 1 commit intomainfrom
fix-split-search

Conversation

@cole-miller
Copy link
Copy Markdown
Member

This could happen when you initiated a search on the left side, then toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

  • Fixed a panic when toggling the split diff view while searching.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 26, 2026
@cole-miller cole-miller enabled auto-merge (squash) February 26, 2026 14:12
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Feb 26, 2026
@cole-miller
Copy link
Copy Markdown
Member Author

/cherry-pick preview
/cherry-pick stable

@cole-miller cole-miller merged commit 1ad9d59 into main Feb 26, 2026
37 checks passed
@cole-miller cole-miller deleted the fix-split-search branch February 26, 2026 14:22
github-actions bot pushed a commit that referenced this pull request Feb 26, 2026
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.
github-actions bot pushed a commit that referenced this pull request Feb 26, 2026
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.
@zed-zippy
Copy link
Copy Markdown
Contributor

zed-zippy bot commented Feb 26, 2026

🍒💥 Cherry-pick did not succeed
https://github.com/zed-industries/zed/actions/runs/22446182810

github-actions bot pushed a commit that referenced this pull request Feb 26, 2026
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.
zed-zippy bot added a commit that referenced this pull request Feb 26, 2026
…to preview) (#50213)

Cherry-pick of #50211 to preview

----
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.

Co-authored-by: Cole Miller <cole@zed.dev>
zed-zippy bot added a commit that referenced this pull request Feb 26, 2026
…to stable) (#50215)

Cherry-pick of #50211 to stable

----
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.

Co-authored-by: Cole Miller <cole@zed.dev>
rtfeldman pushed a commit that referenced this pull request Feb 27, 2026
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.
tahayvr pushed a commit to tahayvr/zed that referenced this pull request Mar 4, 2026
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.
naaiyy pushed a commit to Glass-HQ/Glass that referenced this pull request Mar 6, 2026
This could happen when you initiated a search on the left side, then
toggled into the unified view, then tried to select the next match.

Closes ZED-55G

Release Notes:

- Fixed a panic when toggling the split diff view while searching.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement staff Pull requests authored by a current member of Zed staff

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant