From: Paolo Bonzini <bonzini@gnu.org>
Date: Sat, 27 Jun 2009 10:54:35 +0000 (+0200)
Subject: Fix bootstrap for git 1.6.x
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7da6c6f9a62e4a00ad88beb04f492b28fe517699;p=pspp

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 3e5fdb1a88..6425be7a12 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 2087bab8fc..9d93c865f3 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.