Cole Miller
652f1fa3b0
In `GitStore::open_diff_internal`, when opening a `DiffKind::Unstaged` diff, we previously always overwrote the `unstaged_diff` field of `BufferGitState`. This causes a bug in the following situation: - We call `open_unstaged_diff`, and it hits an await point where it is loading the index text - While that task is suspended, we call `open_uncommitted_diff`. It reaches `open_diff_internal` and sets `buffer_git_state.uncommitted_diff` and `buffer_git_state.unstaged_diff`. It also sets the secondary diff for the uncommitted diff to be the unstaged diff that it just opened. - The `open_unstaged_diff` task wakes up and enters `open_diff_internal`. It creates a new entity for the unstaged diff and overwrites `buffer_git_state.unstaged_diff` with it, but it doesn't update the secondary diff of the uncommitted diff, which still has the entity that was produced in the previous step. - Now the uncommitted diff's secondary diff will never receive updates from the `GitStore`, causing staging information to be incorrect. The fix is for `open_diff_internal` to not overwrite an existing unstaged diff. 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: - Fixed a bug that could cause diff hunks to have an incorrect staged status.
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS, Linux, and Windows you can download Zed directly or install Zed via your local package manager (macOS/Linux/Windows).
Other platforms are not yet available:
- Web (tracking issue)
Developing Zed
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.
Sponsorship
Zed is developed by Zed Industries, Inc., a for-profit company.
If you’d like to financially support the project, you can do so via GitHub Sponsors. Sponsorships go directly to Zed Industries and are used as general company revenue. There are no perks or entitlements associated with sponsorship.