From e5add53861c155e53cd888b6ca7e13a8cbb072be Mon Sep 17 00:00:00 2001
From: Jon Spock <jonspock@protonmail.com>
Date: Mon, 20 Nov 2017 10:49:00 -0800
Subject: [PATCH] Change git commands called so we can get a better description
 for non-release source builds

Github-Merge: #402
Rebased-From: 8fa5f12
---
 share/genbuild.sh | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/share/genbuild.sh b/share/genbuild.sh
index ffa89ca6e47b2..caf928a421554 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -21,14 +21,9 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/
     git diff >/dev/null 2>/dev/null 
 
     # if latest commit is tagged and not dirty, then override using the tag name
+    DESC=$(git describe 2>/dev/null)
     RAWDESC=$(git describe --abbrev=0 2>/dev/null)
-    if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC)" ]; then
-        git diff-index --quiet HEAD -- && DESC=$RAWDESC
-    fi
-
-    # otherwise generate suffix from git, i.e. string like "59887e8-dirty"
-    SUFFIX=$(git rev-parse --short HEAD)
-    git diff-index --quiet HEAD -- || SUFFIX="$SUFFIX-dirty"
+    git diff-index --quiet HEAD -- || DESC="$DESC-dirty"
 
     # get a string like "2012-04-10 16:27:19 +0200"
     LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
@@ -36,8 +31,6 @@ fi
 
 if [ -n "$DESC" ]; then
     NEWINFO="#define BUILD_DESC \"$DESC\""
-elif [ -n "$SUFFIX" ]; then
-    NEWINFO="#define BUILD_SUFFIX $SUFFIX"
 else
     NEWINFO="// No build information available"
 fi