# HG changeset patch
# User Paolo Bonzini <bonzini@gnu.org>
# Date 1246100075 -7200
# Node ID 840c1aaa2f6d16c99d73f6bcf3bae1372b28bc90
# Parent  ed090c498dd0eefb4b1aa03ebb30fa8c17fa8cfd
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
--- 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
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -245,7 +245,7 @@
 }
 
 git_modules_config () {
-  GIT_CONFIG_LOCAL=.gitmodules git config "$@"
+  test -f .gitmodules && git config --file .gitmodules "$@"
 }
 
 # Get gnulib files.