Merge branch 'maint-1.6.0' into maint

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 6fe2f87b850c1a2d689d5a831084da8915c74ea2..b21317d68527988d0c2939e7173098b08bfbb64f 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -99,11 +99,11 @@ 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.
 
-test_expect_failure \
+test_expect_success \
        'pushing a delete should be denied with denyDeletes' '
        cd victim &&
        git config receive.denyDeletes true &&