From cfda781673a31835e88e42a8604fb64a0786a9e4 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 8 Apr 2008 07:38:18 -0600 Subject: [PATCH] Use 'git describe --match' if present (added in git 1.5.5). * build-aux/git-version-gen: Limit result to tags that match 'v*' if possible. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ build-aux/git-version-gen | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cb470d12..3461092bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-08 Eric Blake + + Use 'git describe --match' if present (added in git 1.5.5). + * build-aux/git-version-gen: Limit result to tags that match 'v*' + if possible. + 2008-04-08 Bruno Haible Add tentative support for OpenServer. diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 7aa025365..710870cdb 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2008-04-03.22 +scriptversion=2008-04-08.07 # Copyright (C) 2007-2008 Free Software Foundation # @@ -95,7 +95,8 @@ if test -n "$v" then : # use $v elif test -d .git \ - && v=`git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ && case $v in v[0-9]*) ;; *) (exit 1) ;; -- 2.11.0