Merge branch 'maint'

* maint: GIT-VERSION-GEN: restrict tags used
git-mirror · May 12, 2010 · 0e4607c · 0e4607c
2 parents d92f844 + 3368edd
commit 0e4607c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -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]*)