Skip to content

git: Avoid removing project excerpts for dirty buffers#44312

Merged
cole-miller merged 5 commits intomainfrom
project-diff-shifty-excerpts
Dec 15, 2025
Merged

git: Avoid removing project excerpts for dirty buffers#44312
cole-miller merged 5 commits intomainfrom
project-diff-shifty-excerpts

Conversation

@cole-miller
Copy link
Member

Imitating the approach of #41829. Prevents e.g. reverting a hunk and having that excerpt yanked out from under the cursor.

Release Notes:

  • git: Improved stability of excerpts when editing in the project diff.

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 6, 2025
@cole-miller cole-miller changed the title git: Avoid project excerpts for dirty buffers or buffers with selections git: Avoid removing project excerpts for dirty buffers or buffers with selections Dec 6, 2025
@cole-miller cole-miller enabled auto-merge (squash) December 8, 2025 16:28
@cole-miller cole-miller changed the title git: Avoid removing project excerpts for dirty buffers or buffers with selections git: Avoid removing project excerpts for dirty buffers Dec 15, 2025
@cole-miller cole-miller enabled auto-merge (squash) December 15, 2025 02:48
@cole-miller cole-miller merged commit 86aa9ab into main Dec 15, 2025
24 checks passed
@cole-miller cole-miller deleted the project-diff-shifty-excerpts branch December 15, 2025 02:48
@esthertrapadoux esthertrapadoux moved this to Completed by Zed in Git board Dec 16, 2025
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
…s#44312)

Imitating the approach of zed-industries#41829. Prevents e.g. reverting a hunk and
having that excerpt yanked out from under the cursor.

Release Notes:

- git: Improved stability of excerpts when editing in the project diff.
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

Projects

Status: Completed by Zed

Development

Successfully merging this pull request may close these issues.

1 participant