diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:17 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:37:17 -0700 |
commit | b5d7308a80dd02fe6c077961e16c6a91edd7c19d (patch) | |
tree | 9914964bfefd4c006a8c6155651999ea22b43033 /t/lib-httpd | |
parent | Merge branch 'sb/clone-t57-t56' into maint (diff) | |
parent | t/lib-httpd: pass through GIT_CONFIG_NOSYSTEM env (diff) | |
download | tgif-b5d7308a80dd02fe6c077961e16c6a91edd7c19d.tar.xz |
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.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index f667e7ce2f..9317ba0858 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/ |