Fix bootstrap for git 1.6.x

2009-06-26  Paolo Bonzini  <bonzini@gnu.org>

	* build-aux/bootstrap: Do not use GIT_CONFIG_LOCAL.

diff --git a/ChangeLog b/ChangeLog
index 3e5fdb1a881b5adf00d9b09dce7cf4358493e90c..6425be7a12d44c078848e604580bd3ba7e89c155 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-26  Paolo Bonzini  <bonzini@gnu.org>
+
+       * build-aux/bootstrap: Do not use GIT_CONFIG_LOCAL.
+
 2009-06-25  Eric Blake  <ebb9@byu.net>
 
        version-etc: fix regression

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 2087bab8fc534834a3edb5476fc644fd5abff432..9d93c865f3d1f1573952050540681c586ef2a8aa 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -245,7 +245,7 @@ cleanup_gnulib() {
 }
 
 git_modules_config () {
-  GIT_CONFIG_LOCAL=.gitmodules git config "$@"
+  test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
 # Get gnulib files.