From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 15 Apr 2016 01:37:17 +0000 (-0700)
Subject: Merge branch 'jk/test-httpd-config-nosystem' into maint
X-Git-Tag: v2.8.2~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5d7308a80dd02fe6c077961e16c6a91edd7c19d?ds=inline;hp=-c

Merge branch 'jk/test-httpd-config-nosystem' into maint

The tests that involve running httpd leaked the system-wide
configuration in /etc/gitconfig to the tested environment.

* jk/test-httpd-config-nosystem:
t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env
---

b5d7308a80dd02fe6c077961e16c6a91edd7c19d
diff --combined t/lib-httpd/apache.conf
index f667e7ce2f,3e6317b189..9317ba0858
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@@ -64,9 -64,6 +64,9 @@@ LockFile accept.loc
  <IfModule !mod_mpm_prefork.c>
  	LoadModule mpm_prefork_module modules/mod_mpm_prefork.so
  </IfModule>
 +<IfModule !mod_unixd.c>
 +	LoadModule unixd_module modules/mod_unixd.so
 +</IfModule>
  </IfVersion>
  
  PassEnv GIT_VALGRIND
@@@ -74,6 -71,7 +74,7 @@@ PassEnv GIT_VALGRIND_OPTION
  PassEnv GNUPGHOME
  PassEnv ASAN_OPTIONS
  PassEnv GIT_TRACE
+ PassEnv GIT_CONFIG_NOSYSTEM
  
  Alias /dumb/ www/
  Alias /auth/dumb/ www/auth/dumb/