summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2018-04-13 19:44:39 +0200
committerfrosch <github@elsenhans.name>2018-04-14 17:59:35 +0200
commit34cc1f8b7c932f24e07ead8ed4660ec21851931f (patch)
treea5c1292be87dee64587ce80eae43eb0bc2088135
parent82d4f6c60a21b2dac24c25b6004fe340f6b85262 (diff)
downloadopenttd-34cc1f8b7c932f24e07ead8ed4660ec21851931f.tar.xz
Fix 192770e6da: Version name in master branch contained a duplicate dash.
-rwxr-xr-xfindversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/findversion.sh b/findversion.sh
index e7e25c4e7..8fd292c8b 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