Mercurial > hg > openttd
changeset 17663:d6bd3e10d87f draft
(svn r22435) -Fix: Git revision detection would return too much when tags are involved.
| author | michi_cc <michi_cc@openttd.org> |
|---|---|
| date | Sat, 07 May 2011 15:13:52 +0000 |
| parents | ca89a4a8dee7 |
| children | 01325f5f9d52 |
| files | findversion.sh projects/determineversion.vbs |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/findversion.sh +++ b/findversion.sh @@ -99,7 +99,7 @@ # 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"
--- a/projects/determineversion.vbs +++ b/projects/determineversion.vbs @@ -227,6 +227,9 @@ 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