Skip to content

Conversation

@cole-miller
Copy link
Member

@cole-miller cole-miller commented Dec 15, 2025

Updates #44089

  • Restores the ability to have a partially staged/Indeterminate status for the git panel checkboxes
  • Removes the optimistic_staging logic, since its stated purpose is served by the PendingOps system in the GitStore (which may have bugs, but we should fix them in the git store rather than adding another layer)

Release Notes:

  • Fixed partially-staged files not being represented accurately in the git panel.
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 15, 2025
cole-miller and others added 3 commits December 15, 2025 13:48
Co-authored-by: Anthony Eid <hello@anthonyeid.me>
@cole-miller cole-miller enabled auto-merge (squash) December 15, 2025 23:35
@cole-miller cole-miller merged commit 870159e into main Dec 15, 2025
23 checks passed
@cole-miller cole-miller deleted the staging-bug branch December 15, 2025 23:40
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
…dustries#44837)

Updates zed-industries#44089 

- Restores the ability to have a partially staged/`Indeterminate` status
for the git panel checkboxes
- Removes the `optimistic_staging` logic, since its stated purpose is
served by the `PendingOps` system in the `GitStore` (which may have
bugs, but we should fix them in the git store rather than adding another
layer)

Release Notes:

- Fixed partially-staged files not being represented accurately in the
git panel.

---------

Co-authored-by: Anthony Eid <hello@anthonyeid.me>
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

2 participants