Revert "Enable support for custom versioning"

This reverts functional changes in commit
3bef4a3c1f.

 * Annotated tags only should be used for releases - see #3572 for
   examples of where we want to use lightweight tags.

   See also git-tag(1) on the purpose of annotated and lightweight tags.

 * Version numbers are numbers and should not start with a branch name.

   The commit ID is embedded in the version and uniquely identifies the
   history. `fish --version` and `echo $FISH_VERSION` contain this
   information.
This commit is contained in:
David Adam
2017-08-16 19:20:47 +08:00
parent 3bef4a3c1f
commit dcb39bfa86
2 changed files with 2 additions and 2 deletions

View File

@@ -12,7 +12,7 @@ DEF_VER=unknown
if test -f version
then
VN=$(cat version) || VN="$DEF_VER"
elif ! VN=$(git rev-parse --abbrev-ref HEAD)/$(git describe --always --dirty --tags 2>/dev/null); then
elif ! VN=$(git describe --always --dirty 2>/dev/null); then
VN="$DEF_VER"
fi