Merge branch 'maint'

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

diff --combined GIT-VERSION-GEN
index 59219bd6a58c0c91d050dfb28a1d1bc2602d9538,82fd72652b6d35837b8786005024263ac61630dd..e45513dee938dde3a8428a833fb43023b04ca95b
--- 1/GIT-VERSION-GEN
--- 2/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=v1.7.1
 +DEF_VER=v1.7.1.GIT
  
  LF='
  '
@@@ -12,7 -12,7 +12,7 @@@ if test -f versio
  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]*)