From d75927df39c91108af603fd92dddf2393f87214e Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Tue, 5 Apr 2011 13:30:50 +0200 Subject: [PATCH] build-sys: git describe listed wrong tag The tag v2.14 was probably done without -a option so it was not recogniced by git describe. To over come this I found easiest to add --tag to git-version-gen. This change should be reverted after a release. Signed-off-by: Sami Kerola --- build-aux/git-version-gen | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 686f703..0b7655e 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -103,8 +103,8 @@ then # directory, and "git describe" output looks sensible, use that to # derive a version string. elif test "`git log -1 --pretty=format:x . 2>&1`" = x \ - && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ - || git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`git describe --tags --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --tags --abbrev=4 HEAD 2>/dev/null` \ && v=`printf '%s\n' "$v" | sed "$tag_sed_script"` \ && case $v in v[0-9]*) ;; -- 1.7.10.4