diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6d91d76445..b035e1688a 100644 --- a/configure.ac +++ b/configure.ac @@ -113,9 +113,10 @@ AC_ARG_WITH(git, { test x"$HAVE_GIT" = xyes && command -v "$GIT" > /dev/null && - # see Dependencies in doc/contributing/building_ruby.md + # `git -C`: 1.8.5 + # `git log --no-show-signature`: 2.10.0 AS_CASE([`$GIT -C . --version 2> /dev/null | sed 's/.* //'`], - [0.*|1.*|2.@<:@0-9@:>@.*|2.@<:@12@:>@@<:@0-9@:>@.*|2.3@<:@01@:>@.*], [false], + [0.*|1.*|2.@<:@0-9@:>@.*], [false], [true]) } || HAVE_GIT=no GIT=never-use AC_SUBST(GIT) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 917c407a00..81a33277af 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -526,7 +526,7 @@ HAVE_GIT = no !else if [for /f "tokens=3" %I in ('git --version') do @(\ for /f "delims=. tokens=1-2" %I in ("%I") do @(\ if %I lss 2 (exit 1) else if %I gtr 2 (exit 0) \ - else if %J lss 32 (exit 1) else (exit 0)\ + else if %J lss 10 (exit 1) else (exit 0)\ )\ )] HAVE_GIT = no |