Merge branch 'maint'

* maint:
  GIT-VERSION-GEN: restrict tags used
This commit is contained in:
Junio C Hamano 2010-05-11 23:04:47 -07:00
commit 0e4607c09d

View File

@ -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 --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]*)