From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 2 May 2012 04:20:46 +0000 (-0700)
Subject: Sync with v1.7.10.1
X-Git-Tag: v1.7.11-rc0~78
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/07bc4f587028c9ae98dbf7220fdcbb2744f3fb4e?hp=-c

Sync with v1.7.10.1
---

07bc4f587028c9ae98dbf7220fdcbb2744f3fb4e
diff --combined GIT-VERSION-GEN
index b982e33299,692222afb3..c92dbed2ec
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v1.7.10.1
 +DEF_VER=v1.7.10.GIT
  
  LF='
  '
@@@ -12,7 -12,7 +12,7 @@@ if test -f versio
  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]*)