From: Austin English Date: Sun, 26 Feb 2017 08:05:24 +0000 (-0600) Subject: fix verbose version reporting for git X-Git-Tag: VALGRIND_3_14_0~295 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c23c8cc780a1534194f5c24696c704d4c16867f;p=thirdparty%2Fvalgrind.git fix verbose version reporting for git Signed-off-by: Austin English --- diff --git a/auxprogs/make_or_upd_vgversion_h b/auxprogs/make_or_upd_vgversion_h index 9a3bee3d96..92b07086cb 100755 --- a/auxprogs/make_or_upd_vgversion_h +++ b/auxprogs/make_or_upd_vgversion_h @@ -1,14 +1,10 @@ #!/bin/sh -extract_svn_version() +extract_git_version() { - if [ -d "$1"/.svn ] + if [ -d "$1"/.git ] then - svnversion -n "$1" - elif [ -d "$1"/.git/svn ] - then - cd "$1" || exit 1 - git svn info . | grep '^Revision' | cut -d ' ' -f2 | tr -d '\n' + git rev-parse --short=10 HEAD else echo "unknown" fi @@ -22,18 +18,17 @@ then else cat > include/vgversion.h.tmp <