Merge branch 'jk/parseopt-string-list' into jk/string-list-static-init

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 838770c027017c4d0c88822c231fbef29d5c4ed4..b8ed96fac6e2e8a371b7caf8716b671585022382 100644 (file)
--- 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/