From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 1 Mar 2020 20:16:09 +0000 (+0100)
Subject: Let development version be BRANCH.SHORTHASH
X-Git-Tag: v4.0~577
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2cb5f8f3fdd183872703dbdbf8be63f5e02c7d9;p=thirdparty%2Fccache.git

Let development version be BRANCH.SHORTHASH

Previously the version of a master-based development build was something
like 3.7.1+NNN_gSHORTHASH which is a bit misleading.
---

diff --git a/dev.mk.in b/dev.mk.in
index 07c14b267..70ad15a1d 100644
--- a/dev.mk.in
+++ b/dev.mk.in
@@ -17,9 +17,11 @@ SHELLCHECK = shellcheck
 SHELLCHECK_EXCLUDES = misc/shellcheck-excludes.txt
 TEST = test
 
+git := git --git-dir=$(srcdir)/.git
 version := \
-    $(shell (git --git-dir=$(srcdir)/.git describe --dirty || git --git-dir=$(srcdir)/.git describe || echo vunknown) \
-            2>/dev/null | sed -e 's/v//' -e 's/-/+/' -e 's/-/_/g')
+    $(shell ($(git) describe --exact-match \
+             || echo "$$($(git) rev-parse --abbrev-ref HEAD).$$($(git) rev-parse HEAD | cut -c1-8)") 2>/dev/null \
+            | sed -re 's/^v([0-9].+)/\1/')
 
 dist_dir = ccache-$(version)
 dist_archives = \