Cherry-picked Fix git panel entries getting cut off (#26499)
Closes #26497
Release Notes:
- N/A
Co-authored-by: Cole Miller <cole@zed.dev>
gcp-cherry-pick-bot[bot]
and
Cole Miller
created
6ef3870
git_ui: Truncate long repository and branch names for respective selectors in panel (cherry-pick #26483) (#26488)
Click to expand commit body
Cherry-picked git_ui: Truncate long repository and branch names for
respective selectors in panel (#26483)
This PR fixes a long repo name pushing the branch selector off the
screen, as well as just generally truncating them down in a way smarter
than a fixed character limit when long.
| Before | After |
|---------|-----------|
| 
| 
|
Release Notes:
- Git Panel: Smart truncate long branch and repository names in their
respective selectors
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Cherry-picked git_ui: Panel Horizontal Scroll (#26402)
Known Issues:
- When items can horizontal scroll, the right selected border is hidden
TODO:
- [ ] Width calculation is off
- [ ] When scrollbars should autohide they don't until hovering the
panel
- [ ] When switching to and from scrollbar track being visible we are
missing a notify somewhere.
Release Notes:
- Git Panel: Added horizontal scrolling in the git panel
---------
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Cole Miller <m@cole-miller.net>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Nate Butler <iamnbutler@gmail.com>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Cole Miller <m@cole-miller.net>
Co-authored-by: Cole Miller <cole@zed.dev>
gcp-cherry-pick-bot[bot]
,
Nate Butler
,
Max Brunsfeld
,
Cole Miller
, and
Cole Miller
created
b7a242b
Tweak stage/unstage-and-next to start a commit instead of wrapping in the project diff editor (cherry-pick #26434) (#26490)
Click to expand commit body
Cherry-picked Tweak stage/unstage-and-next to start a commit instead of
wrapping in the project diff editor (#26434)
Release Notes:
- Git Beta: improved the stage-and-next and unstage-and-next actions in
the project diff editor to start a commit after acting on the last hunk
Co-authored-by: Cole Miller <cole@zed.dev>
Cherry-picked Address out-of-bounds panic in inline completion button
(#26394)
Closes #26350
Release Notes:
- Git Beta: Fixed a panic that could occur when using the project diff
Co-authored-by: Cole Miller <cole@zed.dev>
gcp-cherry-pick-bot[bot]
and
Cole Miller
created
74c1ec5
Show a disabled stage all button for no entries (cherry-pick #26436) (#26437)
Click to expand commit body
Cherry-picked Show a disabled stage all button for no entries (#26436)
Closes #ISSUE
Release Notes:
- N/A
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
and
Conrad Irwin
created
61187a9
Fix enter binding in git panel's commit editor on Linux (cherry-pick #26427) (#26438)
Click to expand commit body
Cherry-picked Fix enter binding in git panel's commit editor on Linux
(#26427)
Closes #26110
Release Notes:
- Git Beta: fixed being unable to enter newline in the git panel's
commit editor on Linux
Co-authored-by: Cole Miller <cole@zed.dev>
gcp-cherry-pick-bot[bot]
and
Cole Miller
created
2da767d
Go back to "create branch" in the list (#26433)
Click to expand commit body
Closes #ISSUE
Release Notes:
- N/A
Conrad Irwin
created
58bb9f3
Git commit modal branch list (cherry-pick #26417) (#26435)
Click to expand commit body
Cherry-picked Git commit modal branch list (#26417)
Closes #26273
Release Notes:
- git: Fixes opening the branch selector in the commit modal with
cmd-option-b
- git: Truncates the branch selector in the commit modal
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
and
Conrad Irwin
created
8c3585d
git_ui: Show more information in the branch picker (cherry-pick #25359) (#26432)
Click to expand commit body
Cherry-picked git_ui: Show more information in the branch picker
(#25359)
Final product:

Release Notes:
- Added more information about Git branches to the branch picker.
---------
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Co-authored-by: Angelk90 <20476002+Angelk90@users.noreply.github.com>
Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
Co-authored-by: Marshall Bowers <git@maxdeviant.com>
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
,
Angelk90
,
Danilo Leal
,
Marshall Bowers
, and
Conrad Irwin
created
1365247
Use current upstream for permalink to line (cherry-pick #26398) (#26429)
Click to expand commit body
Cherry-picked Use current upstream for permalink to line (#26398)
Release Notes:
- git: Copy permalink to line now uses the upstream of the current
branch instead of "origin"
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
Cherry-picked Git commit modal command (#26405)
Fix KeyBinding::for_action() to use the active focus handle instead of
what was
rendered last.
This makes the UI consistently chose the cmd-escape binding for close
(because escape in the editor is editor::Cancel?),
so force it to be "escape"
Release Notes:
- git: Fixed escape tooltip in commit modal
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
and
Conrad Irwin
created
633df53
Add a missing notify when updating the project diff (cherry-pick #26396) (#26400)
Click to expand commit body
Cherry-picked Add a missing notify when updating the project diff
(#26396)
Closes #ISSUE
Release Notes:
- Git Beta: Fixed a bug that caused the project diff not to update in
response to git-related events
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
gcp-cherry-pick-bot[bot]
,
Cole Miller
, and
Max Brunsfeld
created
Polish PR
- [ ] Horizontal scrollbar for git panel
- [ ] Allow shift clicking a checkbox in any section to stage the whole
section
- [ ] Clean up design of no changes/pending push state in panel
- [x] Ensure checkbox placeholder dot is centered in the checkbox
- [x] Improve spacing between elements in git panel entries
- [x] Update git branch icon to match branch selector text when disabled
- [x] Truncate last commit message less aggressively in panel
- [x] Clean up new panel header design
- [x] Remove `_background` version control keys (backgrounds are derived
from the foreground colors)
Before:

After:

Before:

After:

Release Notes:
- N/A *or* Added/Fixed/Improved ...
---------
Co-authored-by: Cole Miller <cole@zed.dev>
Co-authored-by: Cole Miller <m@cole-miller.net>
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
Nate Butler
,
Cole Miller
,
Cole Miller
, and
Max Brunsfeld
created
17c0113
Remove GitUiFeatureFlag and enable panel unconditionally (cherry-pick #26386) (#26392)
Click to expand commit body
Cherry-picked Remove GitUiFeatureFlag and enable panel unconditionally
(#26386)
Release Notes:
- git: Enable for everyone
Co-authored-by: Conrad Irwin <conrad.irwin@gmail.com>
gcp-cherry-pick-bot[bot]
and
Conrad Irwin
created
cb8d667
Scroll project diff into view always (cherry-pick #26379) (#26387)
Cherry-picked Restore git panel header (#26354)
Let's play around with it. This should not be added to tomorrow's
preview.
Release Notes:
- Git Beta: Added a panel header with an open diff and stage/unstage all
buttons.
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
Cherry-picked git_ui: Branch picker improvements (#26287)
- Truncate branch names based on the width of the picker
- Use a footer for "Create branch" instead of a picker entry
Still to do:
- [x] Select the footer button when no matches and run the create logic
on `enter`
- [x] Make it possible to quickly select the footer button from the
keyboard when there are matches
Release Notes:
- Git Beta: Removed limitation that made it impossible to create a
branch from the branch picker when it too closely resembled an existing
branch name
Co-authored-by: Cole Miller <cole@zed.dev>
gcp-cherry-pick-bot[bot]
and
Cole Miller
created
4144a2e
git: Disable commit message generation when commit not possible (#26329)
Click to expand commit body
## Issue:
- `Generate Commit Message` will generate a random message if there are
no changes.
<img width="614" alt="image"
src="https://github.com/user-attachments/assets/c16cadac-01af-47c0-a2db-a5bbf62f84bb"
/>
## After Fixed:
- `Generate Commit Message` will be disabled if commit is not possible
<img width="610" alt="image"
src="https://github.com/user-attachments/assets/5ea9ca70-6fa3-4144-ab4e-be7a986d5496"
/>
## Release Notes:
- Fixed: Disable commit message generation when commit is not possible
Richard Hao
created
1eff87c
Follow-up fixes for recent multi buffer optimizations (#26345)
Click to expand commit body
I realized that the optimization broke multi buffer syncing after buffer
reparses.
Release Notes:
- N/A
You may need to zoom in hard to see this 😅 but the main addition of this
PR is just ensuring there's also horizontal border instead of just on
the bottom. Also added some box-shadow here to make it pop out of the
diff a bit more.
| Before | After |
|--------|--------|
| 
| 
|
Release Notes:
- N/A
Danilo Leal
created
ea2df99
Fix performance bottlenecks when multi buffers have huge numbers of buffers (#26308)
Click to expand commit body
This is motivated by trying to make the Project Diff view usable with
huge Git change sets.
Release Notes:
- Improved performance of rendering multibuffers with very large numbers
of buffers
Release Notes:
- Git Beta: added `git:Add` as an alias for the existing `git::Diff`
- Git Beta: Fixed a bug where the 'generate commit message' keybinding
wasn't working.
- Git Beta: Made the empty project diff state a little more helpful with
a button to push, and a button to close the item.
This gives us _very_ rudimentary support for `git switch` and `git
checkout` now, by making them aliases for our existing `git::branch`
call.
Release Notes:
- Git Beta: Added `git::Switch` and `git::CheckoutBranch` as aliases for
the existing `git::Branch`
Mikayla Maki
created
4c455ca
Improve when the commit suggestions would show (#26313)
Click to expand commit body
Release Notes:
- Git Beta: Fixed a few bugs where the suggested commit text wouldn't
show in certain cases, or would update slowly.
Mikayla Maki
created
270e47c
git: Fix errors not showing in the toast notification (#26303)
Click to expand commit body
Release Notes:
- Resolved an issue where error messages from Git were not being
displayed in toast notifications.
<img width="1702" alt="Screenshot 2025-03-08 at 1 11 30 AM"
src="https://github.com/user-attachments/assets/a46517db-4e64-4c5e-a64e-96e820ca9aec"
/>
Kiran_Peraka
created
c075dd5
Change the default staging and unstaging state display (#26299)
Click to expand commit body
This adds a setting for the "border" hunk display mode, as discussed,
and makes it the default.
Here's how it looks in light mode:
<img width="1512" alt="Screenshot 2025-03-07 at 11 39 25 AM"
src="https://github.com/user-attachments/assets/a934faa3-ec69-47e1-ad46-535e48b98e9f"
/>
And dark mode:
<img width="1511" alt="Screenshot 2025-03-07 at 11 39 56 AM"
src="https://github.com/user-attachments/assets/43c9afd1-22bb-4bd8-96ce-82702a6cbc80"
/>
Release Notes:
- Git Beta: Adjusted the default hunk styling for staged and unstaged
changes
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Nate <nate@zed.dev>
Mikayla Maki
,
Conrad
, and
Nate
created
3129e3d
Remove worktree and project notifies (#26244)
Click to expand commit body
This reduces the number of multibuffer syncs from 100,000 to 20,000.
Before this change each editor individually observed the project, so
literally any project change was amplified by the number of editors you
had open.
Now editors listen to their buffers instead of the project, and other
users of `cx.observe` on the project have been updated to use specific
events to reduce churn.
Follow up to #26237
Release Notes:
- Improved performance of Zed in large repos with lots of file system
events.
---------
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com>
(cherry picked from commit 80fb88520f0c52b806ac963dca6a39bead1f49aa)
This reduces the number of multibuffer syncs when starting the editor
with 80
files open in the Zed repo from 10,000,000 to 100,000 by avoiding
O(n**2)
dirtyness checks.
Release Notes:
- Fixed a beachball when restarting in a large repo with a large number
open files
Conrad Irwin
created
53ff7ca
worktree: Add some info-level logging about added and removed repository entries (cherry-pick #26291) (#26292)
Click to expand commit body
Cherry-picked worktree: Add some info-level logging about added and
removed repository entries (#26291)
Trying to track down a user's reported issue with parent repositories
not getting picked up.
Release Notes:
- N/A
Co-authored-by: Cole Miller <cole@zed.dev>
e29fb61
git_ui: Try to prompt the model out of including the diff output (#26281)
Click to expand commit body
This PR updates the prompt for generating commit messages to tell the
model not to include the raw diff output in the message.
Release Notes:
- N/A
Marshall Bowers
created
9db97b8
Fix inline diagnostics in the project diff (#26275)
Click to expand commit body
https://github.com/zed-industries/zed/blob/205f9a9f0391da47a87cac45a41f67d2a23f5a95/crates/editor/src/element.rs#L1643
Due to the snippet above, Zed is supposed to have `row` larger or equal
to `start_row` here:
https://github.com/zed-industries/zed/blob/205f9a9f0391da47a87cac45a41f67d2a23f5a95/crates/editor/src/element.rs#L1694
yet the panic were reported when clicking in the project diff.
That project diff has a lot of highlighting happening already, so the PR
disables inline diagnostics within a git diff view.
Release Notes:
- N/A
Kirill Bulatov
created
871bca5
git: Fix git panel not using default width (#26220)
Click to expand commit body
Closes #26062
Removing the width here causes zed to use the default value (inside
default settings) after restart like other panels.
Release Notes:
- Fixed issue where git panel wasn't using default width after restart
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
loczek
and
Mikayla Maki
created
6dde040
Add staged variants of the hunk_style controls (#26259)
Click to expand commit body
This PR adds a few more hunk style settings that flips the emphasis.
Normally, the concept at Zed has been that the project diff should
emphasize what's going into the commit. However, this leads to a problem
where the default state of all diff hunks are in the non-emphasized
state, making them hard to see and interact with. Especially on light
themes. This PR is an experiment in flipping the emphasis states. Now
the project diff is more like a queue of work, with the next "job" (hunk
to be evaluated) emphasized, and the "completed" (staged) hunks
deemphasized. This fixes the default state issue but is a big jump from
how we've been thinking about it. So here we can try it out and see how
it feels :)
Release Notes:
- Git Beta: Added hunk style settings to emphasize the unstaged state,
rather than the staged state.