From 11d452f8d1875b0afec37c82760f3cc1323ec204 Mon Sep 17 00:00:00 2001 From: Albert Bogusz Date: Mon, 8 Jun 2026 07:38:39 +0100 Subject: [PATCH] Use `SHORT_SHA_LENGTH` for all shortened commit SHAs (#58741) Self-Review Checklist: - [x] I've reviewed my own diff for quality, security, and reliability - [ ] 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) - [ ] Tests cover the new/changed behavior - [x] Performance impact has been considered and is acceptable Fixes hardcoded SHA lengths not using the `SHORT_SHA_LENGTH` constant. Release Notes: - Reduced short commit SHAs in blame and commit tooltips from 8 to 7 - consistent with the graph and history views. --- crates/git_ui/src/blame_ui.rs | 2 +- crates/git_ui/src/commit_tooltip.rs | 2 +- crates/git_ui/src/commit_view.rs | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs index 34bf205b57..080217e5c5 100644 --- a/crates/git_ui/src/blame_ui.rs +++ b/crates/git_ui/src/blame_ui.rs @@ -211,7 +211,7 @@ impl BlameRenderer for GitBlameRenderer { .render(window, cx); let short_commit_id = sha - .get(..8) + .get(..git::SHORT_SHA_LENGTH) .map(|sha| sha.to_string().into()) .unwrap_or_else(|| sha.clone()); let local_offset = time::UtcOffset::current_local_offset().unwrap_or(time::UtcOffset::UTC); diff --git a/crates/git_ui/src/commit_tooltip.rs b/crates/git_ui/src/commit_tooltip.rs index 13ac1c759c..9d4c896606 100644 --- a/crates/git_ui/src/commit_tooltip.rs +++ b/crates/git_ui/src/commit_tooltip.rs @@ -238,7 +238,7 @@ impl Render for CommitTooltip { let short_commit_id = self .commit .sha - .get(0..8) + .get(0..git::SHORT_SHA_LENGTH) .map(|sha| sha.to_string().into()) .unwrap_or_else(|| self.commit.sha.clone()); let full_sha = self.commit.sha.to_string(); diff --git a/crates/git_ui/src/commit_view.rs b/crates/git_ui/src/commit_view.rs index f0ab75dd2e..7dc93157c8 100644 --- a/crates/git_ui/src/commit_view.rs +++ b/crates/git_ui/src/commit_view.rs @@ -324,7 +324,9 @@ impl CommitView { .or(first_worktree_id) }) .context("project has no worktrees")?; - let short_sha = commit_sha.get(0..7).unwrap_or(&commit_sha); + let short_sha = commit_sha + .get(0..git::SHORT_SHA_LENGTH) + .unwrap_or(&commit_sha); let file_name = file .path .file_name()