From 34cc1f8b7c932f24e07ead8ed4660ec21851931f Mon Sep 17 00:00:00 2001 From: frosch Date: Fri, 13 Apr 2018 19:44:39 +0200 Subject: [PATCH] Fix 192770e6da: Version name in master branch contained a duplicate dash. --- findversion.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/findversion.sh b/findversion.sh index e7e25c4e73..8fd292c8bc 100755 --- a/findversion.sh +++ b/findversion.sh @@ -69,7 +69,7 @@ if [ -d "$ROOT_DIR/.git" ]; then HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null` SHORTHASH=`echo ${HASH} | cut -c1-8` ISODATE=`LC_ALL=C git show -s --pretty='format:%ci' HEAD | "$AWK" '{ gsub("-", "", $1); print $1 }'` - BRANCH="`git symbolic-ref -q HEAD 2>/dev/null | sed 's@.*/@@;s@^master$@@'`" + BRANCH="`git symbolic-ref -q HEAD 2>/dev/null | sed 's@.*/@@'`" TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`" if [ -n "$TAG" ]; then