From 7da6c6f9a62e4a00ad88beb04f492b28fe517699 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Sat, 27 Jun 2009 12:54:35 +0200
Subject: [PATCH] Fix bootstrap for git 1.6.x

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

	* build-aux/bootstrap: Do not use GIT_CONFIG_LOCAL.
---
 ChangeLog           | 4 ++++
 build-aux/bootstrap | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3e5fdb1a8..6425be7a1 100644
--- 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 2087bab8f..9d93c865f 100755
--- 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.
-- 
2.11.0