From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 May 2010 06:04:47 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e4607c09d72ada4942ea49298dba83ec4145892?ds=inline;hp=-c

Merge branch 'maint'

* maint:
GIT-VERSION-GEN: restrict tags used
---

0e4607c09d72ada4942ea49298dba83ec4145892
diff --combined GIT-VERSION-GEN
index 59219bd6a5,82fd72652b..e45513dee9
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v1.7.1
 +DEF_VER=v1.7.1.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 --abbrev=4 HEAD 2>/dev/null) &&
+ 	VN=$(git describe --match "v[0-9]*" --abbrev=4 HEAD 2>/dev/null) &&
  	case "$VN" in
  	*$LF*) (exit 1) ;;
  	v[0-9]*)