From 64eaf7ca5aa78a74212f469744809113a9f9ec94 Mon Sep 17 00:00:00 2001 From: David Adam Date: Wed, 16 Aug 2017 19:20:47 +0800 Subject: [PATCH] Revert "Enable support for custom versioning" This reverts functional changes in commit ea3e9698df0d42e06d66fb9bcabd88b31a8e4b23. * 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. (cherry picked from commit dcb39bfa869c0dd35409fb6c735632fec2510da1) --- CONTRIBUTING.md | 2 +- build_tools/git_version_gen.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f204772b..2dfb0cc13 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,7 +8,7 @@ Fish source should limit the C++ features it uses to those available in C++11. I ## Versioning -The fish version is constructed by the *build_tools/git_version_gen.sh* script. For developers the version is the branch name plus the output of `git describe --always --dirty --tags`. Normally the main part of the version will be the closest annotate tag. Which itself is usually the most recent release number (e.g., `2.6.0`). It can be useful to create a lightweight tag to make it clear that a fish binary is based on a particular development branch. For example, `git tag 3.0alpha` to make it clear that fish was built from the 3.x major release development branch regardless of the branch name. +The fish version is constructed by the *build_tools/git_version_gen.sh* script. For developers the version is the branch name plus the output of `git describe --always --dirty`. Normally the main part of the version will be the closest annotated tag. Which itself is usually the most recent release number (e.g., `2.6.0`). ## Include What You Use diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh index b5bffa599..ac3c26186 100755 --- a/build_tools/git_version_gen.sh +++ b/build_tools/git_version_gen.sh @@ -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