Merge branch 'maint'

* maint: GIT-VERSION-GEN: restrict tags used
2010-05-11 23:04:47 -07:00 · 2010-05-11 23:04:47 -07:00 · 0e4607c09d
parent d92f844610 3368edd4cd
commit 0e4607c09d
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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]*)