diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-12 06:04:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-12 06:04:47 (GMT) |
| commit | 0e4607c09d72ada4942ea49298dba83ec4145892 (patch) | |
| tree | 4041afba9e0fd56d4061582c7fcdb5af98037495 | |
| parent | d92f84461033b6ca3e19e31d30e5524bd25346ee (diff) | |
| parent | 3368edd4cda6306d524e10758e2c5a187dcd4ba6 (diff) | |
| download | git-0e4607c09d72ada4942ea49298dba83ec4145892.zip git-0e4607c09d72ada4942ea49298dba83ec4145892.tar.gz git-0e4607c09d72ada4942ea49298dba83ec4145892.tar.bz2 | |
Merge branch 'maint'
* maint:
GIT-VERSION-GEN: restrict tags used
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 59219bd..e45513d 100755 --- 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]*) |