From b8bd5fd8de6301cac266e1d5c071aeb5893236e8 Mon Sep 17 00:00:00 2001
From: VolodymyrBg <aqdrgg19@gmail.com>
Date: Mon, 8 Sep 2025 12:13:47 +0300
Subject: [PATCH] Normalize short_git_version: strip optional 'g' and take
 first 7 chars

---
 crates/libzkp/src/utils.rs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/crates/libzkp/src/utils.rs b/crates/libzkp/src/utils.rs
index aa15706943..2eebcf86c3 100644
--- a/crates/libzkp/src/utils.rs
+++ b/crates/libzkp/src/utils.rs
@@ -15,14 +15,9 @@ const GIT_VERSION: &str = git_version!(args = ["--abbrev=7", "--always"]);
 
 /// Shortened git commit ref from [`scroll_zkvm_prover`].
 pub(crate) fn short_git_version() -> String {
-    let commit_version = GIT_VERSION.split('-').next_back().unwrap();
-
-    // Check if use commit object as fallback.
-    if commit_version.len() < 8 {
-        commit_version.to_string()
-    } else {
-        commit_version[1..8].to_string()
-    }
+    let last = GIT_VERSION.split('-').next_back().unwrap();
+    let hash = last.strip_prefix('g').unwrap_or(last);
+    hash.chars().take(7).collect()
 }
 
 /// Wrapper to read JSON that might be deeply nested.