File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ RUBYOPT = -
4545RUN_OPTS = --disable-gems
4646
4747GIT_IN_SRC = $(GIT ) -C $(srcdir )
48- GIT_LOG = $(GIT_IN_SRC ) log
48+ GIT_LOG = $(GIT_IN_SRC ) log --no-show-signature
4949GIT_LOG_FORMAT = $(GIT_LOG ) --pretty=format:
5050
5151# GITPULLOPTIONS = --no-tags
Original file line number Diff line number Diff line change @@ -113,9 +113,11 @@ AC_ARG_WITH(git,
113113{
114114 test x"$HAVE_GIT" = xyes &&
115115 command -v "$GIT" > /dev/null &&
116- # git 1.8.4 fails with `-C` as unknown option, but git 1.8.5
117- # succeeds and exits by `--version`.
118- $GIT -C . --version > /dev/null 2>&1
116+ # `git -C`: 1.8.5
117+ # `git log --no-show-signature`: 2.10.0
118+ AS_CASE ( [ `$GIT -C . --version 2> /dev/null | sed 's/.* //'`] ,
119+ [ 0.*|1.*|2.@<:@ 0-9@:>@ .*] , [ false] ,
120+ [ true] )
119121} || HAVE_GIT=no GIT=never-use
120122AC_SUBST ( GIT )
121123AC_SUBST ( HAVE_GIT )
You can’t perform that action at this time.
0 commit comments