Fix findversion.sh using descendant instead of ancestor tags for the version string.

9 years ago · 01482ba6b4
parent 8cfc1e9d23
commit 01482ba6b4
1 changed files with 1 additions and 1 deletions
--- 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 | sed 's@\^0$@@'`"
+	TAG="`git describe --tags 2>/dev/null`"
 	if [ -n "$TAG" ]; then
 		BRANCH=""
 		REV="$TAG"