GIT-VERSION-GEN: do not force abbreviation length used by 'describe'

The default version name for a Git binary is computed by running "git describe" on the commit the binary is made out of, basing on a tag whose name matches "v[0-9]*", e.g. v2.11.0-rc2-2-g7f1dc9. In the very early days, with 9b88fcef7d ("Makefile: use git-describe to mark the git version.", 2005-12-27), we used "--abbrev=4" to get absolute minimum number of abbreviated commit object name. This was later changed to match the default minimum of 7 with bf505158d0 ("Git 1.7.10.1", 2012-05-01). These days, the "default minimum" scales automatically depending on the size of the repository, and there is no point in specifying a particular abbreviation length; all we wanted since Git 1.7.10.1 days was to get "something reasonable we would use by default". Just drop "--abbrev=<number>" from the invocation of "git describe" and let the command pick what it thinks is appropriate, taking the end user's configuration and the repository contents into account. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ramsay Jones committed Dec 4, 2016 at 20:45 UTC a7659747c2eeb0c601ced321446da92149310cd0
1 file changed +1 -1
GIT-VERSION-GEN
+1 -1
@@ -12,7 +12,7 @@ if test -f version
12 then
13 VN=$(cat version) || VN="$DEF_VER"
14 elif test -d ${GIT_DIR:-.git} -o -f .git &&
15 - VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) &&
15 + VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) &&
16 case "$VN" in
17 *$LF*) (exit 1) ;;
18 v[0-9]*)