Fix findversion.sh using descendant instead of ancestor tags for the version string.
This commit is contained in:
@@ -99,7 +99,7 @@ elif [ -d "$ROOT_DIR/.git" ]; then
|
|||||||
# No rev? Maybe it is a custom git-svn clone
|
# 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@"`
|
REV_NR=`LC_ALL=C git log --pretty=format:%b --grep="git-svn-id:.*@[0-9]*" -1 | sed "s@.*\@\([0-9]*\).*@\1@"`
|
||||||
fi
|
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
|
if [ -n "$TAG" ]; then
|
||||||
BRANCH=""
|
BRANCH=""
|
||||||
REV="$TAG"
|
REV="$TAG"
|
||||||
|
Reference in New Issue
Block a user