Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 May 2010 06:04:47 +0000 (23:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 May 2010 06:04:47 +0000 (23:04 -0700)
* maint:
GIT-VERSION-GEN: restrict tags used

GIT-VERSION-GEN patch | blob | history
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 59219bd6a58c0c91d050dfb28a1d1bc2602d9538..e45513dee938dde3a8428a833fb43023b04ca95b 100755 (executable)
--- 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]*)