diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-01-24 20:51:06 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2014-01-24 20:51:06 +0800 |
| commit | 8cb051d44d86c19d6ccc9881e3711a1cc26db94c (patch) | |
| tree | 36c32b3edb70e654c79f4ddd4db59222d8e873fe /build_tools | |
| parent | 535445a55523a142cdf34071ddb1f3a1c3af1376 (diff) | |
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.
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/git_version_gen.sh | 2 | ||||
| -rwxr-xr-x | build_tools/make_tarball.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh index 3ffd0eb2..a2c337be 100755 --- a/build_tools/git_version_gen.sh +++ b/build_tools/git_version_gen.sh @@ -14,7 +14,7 @@ then VN=$(cat version) || VN="$DEF_VER" elif test -d .git -o -f .git && type git >/dev/null then - VN=$(git describe --tags --dirty 2>/dev/null) + VN=$(git describe --dirty 2>/dev/null) else VN="$DEF_VER" fi diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh index f16171d1..a044d2f2 100755 --- a/build_tools/make_tarball.sh +++ b/build_tools/make_tarball.sh @@ -20,7 +20,7 @@ wd="$PWD" prefix="fish" # Get the version from git-describe -VERSION=`git describe --tags --dirty 2>/dev/null` +VERSION=`git describe --dirty 2>/dev/null` prefix="$prefix-$VERSION" # The path where we will output the tar file |