summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-06 18:39:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-06 18:39:08 (GMT)
commit3e95e47c5d0a09593c9a9ac50f84d04de577c6b0 (patch)
tree06834544e96e9605863bb3de450d6f361a080442 /t/lib-httpd
parentf4ee510684e7c6a7b516f1db3817358ed38b4474 (diff)
parent1fad5033ad664e617eb05f778c83c1a75bddc8d8 (diff)
downloadgit-3e95e47c5d0a09593c9a9ac50f84d04de577c6b0.zip
git-3e95e47c5d0a09593c9a9ac50f84d04de577c6b0.tar.gz
git-3e95e47c5d0a09593c9a9ac50f84d04de577c6b0.tar.bz2
Merge branch 'jk/test-httpd-config-nosystem'
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
Diffstat (limited to 't/lib-httpd')
-rw-r--r--t/lib-httpd/apache.conf1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index f667e7c..9317ba0 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -74,6 +74,7 @@ PassEnv GIT_VALGRIND_OPTIONS
PassEnv GNUPGHOME
PassEnv ASAN_OPTIONS
PassEnv GIT_TRACE
+PassEnv GIT_CONFIG_NOSYSTEM
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/