summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-04-15 01:37:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-15 01:37:17 (GMT)
commitb5d7308a80dd02fe6c077961e16c6a91edd7c19d (patch)
tree9914964bfefd4c006a8c6155651999ea22b43033 /t/lib-httpd
parent5859f04f0807264c03951a2e7be9192e00487039 (diff)
parent1fad5033ad664e617eb05f778c83c1a75bddc8d8 (diff)
downloadgit-b5d7308a80dd02fe6c077961e16c6a91edd7c19d.zip
git-b5d7308a80dd02fe6c077961e16c6a91edd7c19d.tar.gz
git-b5d7308a80dd02fe6c077961e16c6a91edd7c19d.tar.bz2
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
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/