Reject git command that does not accept -C option

Author: nobu

configure.ac

@@ -107,10 +107,16 @@ HAVE_GIT=yes
 AC_ARG_WITH(git,
 	AS_HELP_STRING([--without-git], [never use git]),
 	[AS_CASE([$withval],
-	    [no],  [GIT=never-use HAVE_GIT=no],
+	    [no],  [HAVE_GIT=no],
 	    [yes], [],
 	    [GIT=$withval])])
-AS_IF([test x"$HAVE_GIT" = xyes], [command -v "$GIT" > /dev/null || HAVE_GIT=no])
+{
+    test x"$HAVE_GIT" = xyes &&
+    command -v "$GIT" > /dev/null &&
+    # git 1.8.4 fails with `-C` as unknown option, but git 1.8.5
+    # succeeds and exits by `--version`.
+    $GIT -C . --version > /dev/null 2>&1
+} || HAVE_GIT=no GIT=never-use
 AC_SUBST(GIT)
 AC_SUBST(HAVE_GIT)
 

win32/Makefile.sub

@@ -506,17 +506,18 @@ VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/missing;$(win_src
 !ifndef GIT
 GIT = git
 !endif
+GIT_TO_CHECK_C_OPTION = -C . --version >nul 2>&1
 !if "$(HAVE_GIT)" == "yes" || "$(HAVE_GIT)" == "no"
 !else if "$(GIT)" == ""
 HAVE_GIT = no
 !else if [for %I in ($(GIT)) do @if not "%~xI" == "" exit 1]
-! if [for %I in ($(GIT)) do @if not "%~$$PATH:I" == "" exit 1]
+! if [%I $(GIT_TO_CHECK_C_OPTION)] == 0
 HAVE_GIT = yes
 ! else
 HAVE_GIT = no
 ! endif
 !else
-! if [for %x in (%PATHEXT:;= %) do @for %I in ($(GIT)%x) do @if not "%~$$PATH:I" == "" exit 1]
+! if [for %x in (%PATHEXT:;= %) do @($(GIT)%x $(GIT_TO_CHECK_C_OPTION) && exit 0)] == 0
 HAVE_GIT = yes
 ! else
 HAVE_GIT = no