use annotated tags only for version checking

Note: if you have previously cloned the repository, the tags for
previous versions have been edited. Use `git fetch --tags` to
synchronise your local copy.
This commit is contained in:
David Adam 2014-01-24 20:51:06 +08:00
parent 535445a555
commit 8cb051d44d
2 changed files with 2 additions and 2 deletions

View file

@ -14,7 +14,7 @@ then
VN=$(cat version) || VN="$DEF_VER" VN=$(cat version) || VN="$DEF_VER"
elif test -d .git -o -f .git && type git >/dev/null elif test -d .git -o -f .git && type git >/dev/null
then then
VN=$(git describe --tags --dirty 2>/dev/null) VN=$(git describe --dirty 2>/dev/null)
else else
VN="$DEF_VER" VN="$DEF_VER"
fi fi

View file

@ -20,7 +20,7 @@ wd="$PWD"
prefix="fish" prefix="fish"
# Get the version from git-describe # Get the version from git-describe
VERSION=`git describe --tags --dirty 2>/dev/null` VERSION=`git describe --dirty 2>/dev/null`
prefix="$prefix-$VERSION" prefix="$prefix-$VERSION"
# The path where we will output the tar file # The path where we will output the tar file