From 914798e717bae07edaaa99f59482be0f444985db Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Thu, 9 Apr 2026 05:13:56 -0600
Subject: [PATCH] more descriptive git naming (#722)

---
 build.rs                 | 6 +++---
 src/retroachievements.rs | 2 +-
 src/ui/netplay.rs        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.rs b/build.rs
index e3e02742..27e2e55c 100644
--- a/build.rs
+++ b/build.rs
@@ -265,12 +265,12 @@ fn main() {
     }
 
     let git_output = std::process::Command::new("git")
-        .args(["rev-parse", "HEAD"])
+        .args(["describe", "--always", "--dirty"])
         .output()
         .unwrap();
 
-    let git_hash = String::from_utf8(git_output.stdout).unwrap();
-    println!("cargo:rustc-env=GIT_HASH={git_hash}");
+    let git_describe = String::from_utf8(git_output.stdout).unwrap();
+    println!("cargo:rustc-env=GIT_DESCRIBE={git_describe}");
 
     println!("cargo:rerun-if-env-changed=NETPLAY_ID");
     let netplay_id = std::env::var("NETPLAY_ID").unwrap_or("gopher64".to_string());
diff --git a/src/retroachievements.rs b/src/retroachievements.rs
index 69548894..c0a62f0d 100644
--- a/src/retroachievements.rs
+++ b/src/retroachievements.rs
@@ -60,7 +60,7 @@ pub extern "C" fn rust_server_call(
         .user_agent(format!(
             "{}/{}",
             env!("CARGO_PKG_NAME"),
-            env!("CARGO_PKG_VERSION")
+            env!("GIT_DESCRIBE")
         ))
         .build()
         .unwrap();
diff --git a/src/ui/netplay.rs b/src/ui/netplay.rs
index fb70519e..dfde9015 100644
--- a/src/ui/netplay.rs
+++ b/src/ui/netplay.rs
@@ -642,7 +642,7 @@ fn create_session(
         let create_room = NetplayMessage {
             message_type: "request_create_room".to_string(),
             player_name: Some(player_name),
-            client_sha: Some(env!("GIT_HASH").to_string()),
+            client_sha: Some(env!("GIT_DESCRIBE").to_string()),
             netplay_version: Some(NETPLAY_VERSION),
             emulator: Some(EMU_NAME.to_string()),
             accept: None,
@@ -763,7 +763,7 @@ fn join_session(
         let join_room = NetplayMessage {
             message_type: "request_join_room".to_string(),
             player_name: Some(player_name),
-            client_sha: Some(env!("GIT_HASH").to_string()),
+            client_sha: Some(env!("GIT_DESCRIBE").to_string()),
             netplay_version: Some(NETPLAY_VERSION),
             emulator: Some(EMU_NAME.to_string()),
             accept: None,