Merge branch 'maint'

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

Merge branch 'maint'
* maint: GIT-VERSION-GEN: restrict tags used
0e4607c0 · Junio C Hamano · d92f8446 · 3368edd4 · 0e4607c0
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

GIT-VERSION-GEN GIT-VERSION-GEN +1 -1

未找到文件。
--- 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]*)