From c4dc52c06c9b016ffff797e963fe9a8d6bc6f2e0 Mon Sep 17 00:00:00 2001
From: "Justin C. Miller" <justin@devjustinian.com>
Date: Sun, 3 Feb 2019 00:06:39 -0800
Subject: [PATCH] Fix a version parsing issue when on a tagged version

---
 generate_build.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/generate_build.py b/generate_build.py
index 78b9548..e2a5172 100755
--- a/generate_build.py
+++ b/generate_build.py
@@ -53,10 +53,14 @@ def get_sources(path, srcroot):
 
 def get_git_version():
     from subprocess import run
-    cp = run(['git', 'describe', '--dirty', '--abbrev=7'],
+    cp = run(['git', 'describe', '--dirty'],
             check=True, capture_output=True)
     full_version = cp.stdout.decode('utf-8').strip()
 
+    cp = run(['git', 'rev-parse', 'HEAD'],
+            check=True, capture_output=True)
+    full_sha = cp.stdout.decode('utf-8').strip()
+
     dirty = False
     parts1 = full_version.split('-')
     if parts1[-1] == "dirty":
@@ -69,7 +73,7 @@ def get_git_version():
         parts2[0],
         parts2[1],
         parts2[2],
-        parts1[-1][1:],
+        full_sha[:7],
         dirty)