Explicitly set the git log format rather than relying on the default

Originally committed to SVN as r6777.
This commit is contained in:
Thomas Goyne 2012-05-14 13:21:43 +00:00
parent 069b34a806
commit bdda855438
1 changed files with 1 additions and 1 deletions

View File

@ -163,7 +163,7 @@ AS_IF([test -n "$SVN_REVISION" -a -z "`echo $SVN_REVISION | tr -d '0-9'`"], [
SVN_REVISION=`cat $srcdir/svn_revision` SVN_REVISION=`cat $srcdir/svn_revision`
AC_MSG_RESULT([$SVN_REVISION from "$srcdir/svn_revision"]) AC_MSG_RESULT([$SVN_REVISION from "$srcdir/svn_revision"])
], [test -d "$srcdir/../.git"], [ ], [test -d "$srcdir/../.git"], [
SVN_REVISION=[`git log | grep git-svn-id -m 1 | sed -E 's/.*@([0-9]+) .*/\1/'`] SVN_REVISION=[`git log --format=%b | grep git-svn-id -m 1 | sed -E 's/.*@([0-9]+) .*/\1/'`]
`echo $SVN_REVISION > $srcdir/svn_revision` `echo $SVN_REVISION > $srcdir/svn_revision`
AC_MSG_RESULT([$SVN_REVISION from git]) AC_MSG_RESULT([$SVN_REVISION from git])
], [ ], [