Skip to content

git: Fix out-of-bounds indexing when diff bases contain CRLF (cherry-pick #52605)#53251

Merged
cole-miller merged 1 commit intov0.230.xfrom
cherry-pick-crlf
Apr 6, 2026
Merged

git: Fix out-of-bounds indexing when diff bases contain CRLF (cherry-pick #52605)#53251
cole-miller merged 1 commit intov0.230.xfrom
cherry-pick-crlf

Conversation

@cole-miller
Copy link
Copy Markdown
Member

Self-Review Checklist:

  • I've reviewed my own diff for quality, security, and reliability
  • Unsafe blocks (if any) have justifying comments
  • The content is consistent with the UI/UX checklist
  • Tests cover the new/changed behavior
  • Performance impact has been considered and is acceptable

Release Notes:

  • Fixed a crash on windows with diffs.

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Release Notes:

- N/A
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 6, 2026
@zed-community-bot zed-community-bot bot added the staff Pull requests authored by a current member of Zed staff label Apr 6, 2026
@miguelraz miguelraz mentioned this pull request Apr 6, 2026
@miguelraz
Copy link
Copy Markdown
Contributor

@zed-zippy approved

@cole-miller cole-miller merged commit 5a202db into v0.230.x Apr 6, 2026
41 checks passed
@cole-miller cole-miller deleted the cherry-pick-crlf branch April 6, 2026 16:36
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.

2 participants