Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Use `SHORT_SHA_LENGTH` for all shortened commit SHAs (#58741)

Albert Boguszf99fe5d8c2a0
diff --git a/crates/git_ui/src/blame_ui.rs b/crates/git_ui/src/blame_ui.rs
index 34bf205b57a..080217e5c53 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 13ac1c759cf..9d4c8966068 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 f0ab75dd2e2..7dc93157c87 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()