diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:33 -0800 |
| commit | 0a45050a1456ed18a0b886f60b1b217b4db165ae (patch) | |
| tree | 618f5f105e6ceba90ff155ffe781ddfa357651ea | |
| parent | Merge branch 'jk/stash-disable-renames-internally' (diff) | |
| parent | GIT-VERSION-GEN: do not force abbreviation length used by 'describe' (diff) | |
| download | tgif-0a45050a1456ed18a0b886f60b1b217b4db165ae.tar.xz | |
Merge branch 'rj/git-version-gen-do-not-force-abbrev'
A minor build update.
* rj/git-version-gen-do-not-force-abbrev:
GIT-VERSION-GEN: do not force abbreviation length used by 'describe'
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 556fbfc104..f95b04bb36 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -12,7 +12,7 @@ if test -f version then VN=$(cat version) || VN="$DEF_VER" elif test -d ${GIT_DIR:-.git} -o -f .git && - VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) && + VN=$(git describe --match "v[0-9]*" HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; v[0-9]*) |