diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:20:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:21:46 -0700 |
commit | 07bc4f587028c9ae98dbf7220fdcbb2744f3fb4e (patch) | |
tree | a65c0509b01188d435d1bfc88b7dbe7508438988 /GIT-VERSION-GEN | |
parent | 9768cafe681a7844d5a1d067991053b25db83bbb (diff) | |
parent | bf505158d0292eed441fff1bc9157da19645ee91 (diff) | |
download | git-07bc4f587028c9ae98dbf7220fdcbb2744f3fb4e.tar.gz |
Sync with v1.7.10.1
Diffstat (limited to 'GIT-VERSION-GEN')
-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 b982e33299..c92dbed2ec 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 -o -f .git && - VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) && + VN=$(git describe --match "v[0-9]*" --abbrev=7 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; v[0-9]*) |