cpp/openttd-patchpack/source Changeset - r17653:8e16767f3f42

Changeset - r17653:8e16767f3f42

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

michi_cc - 14 years ago 2011-05-07 15:13:52
michi_cc@openttd.org

(svn r22435) -Fix: Git revision detection would return too much when tags are involved.

2 files changed with 4 insertions and 1 deletions:

findversion.sh

projects/determineversion.vbs

0 comments (0 inline, 0 general)

findversion.sh

➞

Show inline comments

@@ @@ -90,25 +90,25 @@ elif [ -d "$ROOT_DIR/.git" ]; then @@
 	git update-index --refresh >/dev/null
 	if [ -n "`git diff-index HEAD`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`
 	REV="g`echo $HASH | cut -c1-8`"
 	BRANCH="`git symbolic-ref -q HEAD 2>/dev/null | sed 's@.*/@@;s@^master$@@'`"
 	REV_NR=`LC_ALL=C git log --pretty=format:%s --grep="^(svn r[0-9]*)" -1 | sed "s@.*(svn r\([0-9]*\)).*@\1@"`
 	if [ -z "$REV_NR" ]; 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"
 	fi
 elif [ -d "$ROOT_DIR/.hg" ]; then
 	# We are a hg checkout
 	if [ -n "`hg status | grep -v '^?'`" ]; then
 		MODIFIED="2"
 	fi
 	HASH=`LC_ALL=C hg id -i | cut -c1-12`
 	REV="h`echo $HASH | cut -c1-8`"
 	BRANCH="`hg branch | sed 's@^default$@@'`"

projects/determineversion.vbs

➞

Show inline comments

@@ @@ -218,24 +218,27 @@ Function DetermineSVNVersion() @@
 						End If ' Err.Number = 0
 					End If ' revision = ""
 					' Check if a tag is currently checked out
 					Err.Clear
 					Set oExec = WshShell.Exec("git name-rev --name-only --tags --no-undefined HEAD")
 					If Err.Number = 0 Then
 						' Wait till the application is finished ...
 						Do While oExec.Status = 0
 						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
 				End If ' Err.Number = 0
 			End If ' oExec.ExitCode = 0
 		End If ' Err.Number = 0
 		If version = "norev000" Then
 			' git detection failed, reset error and try mercurial (hg)
 			Err.Clear
 			Set oExec = WshShell.Exec("hg id -i")
 			If Err.Number = 0 Then

0 comments (0 inline, 0 general)