Merge branch 'jk/diff-compact-heuristic'

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 2dcbb00865b0a918c015541588a34bb1671d3514..018a83a5a18431f120672b7cd8874bfb72e8d8fb 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/