From 29357ef65c0cc806d08e9b4b2e0c5f24a2e7b02b Mon Sep 17 00:00:00 2001 From: michi_cc Date: Sat, 7 May 2011 15:13:52 +0000 Subject: [PATCH] (svn r22435) -Fix: Git revision detection would return too much when tags are involved. --- findversion.sh | 2 +- projects/determineversion.vbs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/findversion.sh b/findversion.sh index e83a6c0bf5..35568de0ca 100755 --- a/findversion.sh +++ b/findversion.sh @@ -99,7 +99,7 @@ elif [ -d "$ROOT_DIR/.git" ]; then # No rev? Maybe it is a custom git-svn clone REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"` fi - TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null`" + TAG="`git name-rev --name-only --tags --no-undefined HEAD 2>/dev/null | sed 's@\^0$@@'`" if [ -n "$TAG" ]; then BRANCH="" REV="$TAG" diff --git a/projects/determineversion.vbs b/projects/determineversion.vbs index 8a991b40e1..e16da751d4 100755 --- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -227,6 +227,9 @@ Function DetermineSVNVersion() Loop If oExec.ExitCode = 0 Then version = oExec.StdOut.ReadLine() + If Right(version, 2) = "^0" Then + version = Left(version, Len(version) - 2) + End If branch = "" End If ' oExec.ExitCode = 0 End If ' Err.Number = 0