Merge branch 'maint'

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index da69f087b41182be84be0c98a78c1a45b879cfe5..b21317d68527988d0c2939e7173098b08bfbb64f 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -99,7 +99,7 @@ test_expect_success \
        ! test -f victim/.git/refs/heads/extra
 '
 
-unset GIT_CONFIG GIT_CONFIG_LOCAL
+unset GIT_CONFIG
 HOME=`pwd`/no-such-directory
 export HOME ;# this way we force the victim/.git/config to be used.