diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:18:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:18:44 -0700 |
| commit | bf505158d0292eed441fff1bc9157da19645ee91 (patch) | |
| tree | 7e4336d5e78244cf79c13b16698c99e355d3a0bb /GIT-VERSION-GEN | |
| parent | Merge branch 'pw/fast-import-dataref-parsing' into maint (diff) | |
| download | tgif-bf505158d0292eed441fff1bc9157da19645ee91.tar.xz | |
Git 1.7.10.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'GIT-VERSION-GEN')
| -rwxr-xr-x | GIT-VERSION-GEN | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1f55d3e900..692222afb3 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.10 +DEF_VER=v1.7.10.1 LF=' ' @@ -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]*) |