mirror of
https://github.com/fish-shell/fish-shell
synced 2024-11-10 23:24:39 +00:00
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:
parent
535445a555
commit
8cb051d44d
2 changed files with 2 additions and 2 deletions
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue