Merge branch 'jk/test-httpd-config-nosystem'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:08 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Apr 2016 18:39:08 +0000 (11:39 -0700)
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

1  2 
t/lib-httpd/apache.conf
diff --combined t/lib-httpd/apache.conf
index f667e7ce2f33dba0c10764f2f62101685d74cf3d,3e6317b189235478c75bbe4b024ac4bec6d19221..9317ba08582d2a5d06ef5a2a8d8e63c72a146b3b
@@@ -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/