From d7269a2b99ac9415da153bc8c48de12153f760c3 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Thu, 18 May 2017 11:27:02 +0200 Subject: [PATCH] Use un-annotated tags for determining version --- build-aux/gen-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-aux/gen-version b/build-aux/gen-version index c2d71ae9ea..c40fc159c1 100755 --- a/build-aux/gen-version +++ b/build-aux/gen-version @@ -24,7 +24,7 @@ fi if [ ! -z "$(git rev-parse --abbrev-ref HEAD 2> /dev/null)" ]; then if $(git rev-parse --abbrev-ref HEAD | grep -q 'rel/'); then REL_TYPE="$(git rev-parse --abbrev-ref HEAD | cut -d/ -f 2 | cut -d- -f 1)" - VERSION="$(git describe --match=${REL_TYPE}-* --dirty=.dirty | cut -d- -f 2-)" + VERSION="$(git describe --match=${REL_TYPE}-* --tags --dirty=.dirty | cut -d- -f 2-)" else GIT_VERSION=$(git show --no-patch --format=format:%h HEAD) BRANCH=".$(git rev-parse --abbrev-ref HEAD | perl -p -e 's/[^[:alnum:]]//g;')" -- 2.47.2