git_ui: Hide status icon when status_style is set to label_color#51947
Merged
Veykril merged 1 commit intozed-industries:mainfrom Mar 24, 2026
Merged
Conversation
cla-bot
bot
added
the
cla-signed
zed-codeowner-coordinator
bot
requested review from
a team,
Veykril and
kubkon
and removed request for
a team
zed-community-bot
bot
added
the
first contribution
Veykril
approved these changes
Mar 19, 2026
Member
|
Thanks! |
Member
|
CI is unhappy |
auto-merge was automatically disabled
March 24, 2026 11:41
Head branch was pushed to by a user without write access
Vastargazing
force-pushed
the
fix/git_panel_label_color_status_icon
branch
from
f21f6ee to
54fb05e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Context
When
git_panel.status_styleis set tolabel_color, the git panelshould indicate file status through text color only, without showing
status icons. However, the icons were still being rendered regardless
of this setting.
The root cause:
git_status_icon(status)was called unconditionallyin
render_status_entry, with no check against the currentstatus_stylevalue.Closes #51714
How to Review
Single change in
crates/git_ui/src/git_panel.rs—render_status_entryfunction. The icon render call is now wrappedin
.when(status_style != StatusStyle::LabelColor, ...).Release Notes:
git_panel.status_styleis set to
label_colorBug:
Fix:
