cpp/openttd-patchpack/source Changeset - r22795:deed187ee38f

Changeset - r22795:deed187ee38f

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 7 years ago 2018-04-13 17:44:39
frosch@openttd.org

Fix 192770e6da: Version name in master branch contained a duplicate dash.

1 file changed with 1 insertions and 1 deletions:

findversion.sh

0 comments (0 inline, 0 general)

findversion.sh

➞

Show inline comments

@@ @@ -66,13 +66,13 @@ if [ -d "$ROOT_DIR/.git" ]; then @@
 	if [ -n "`git diff-index HEAD`" ]; then
 		MODIFIED="2"
 	fi
 	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
 		VERSION="${TAG}"
 	elif [ "${BRANCH}" = "master" ]; then
 		VERSION="${ISODATE}-g${SHORTHASH}"

0 comments (0 inline, 0 general)