Merge branch 'sp/make'

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 2c151912a3bcf2c91cfafcbc22f11bc71fedd34d..b1c97b0dfb1748a7ba80c18d2d4b84bdee192c95 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -106,11 +106,11 @@ export HOME ;# this way we force the victim/.git/config to be used.
 test_expect_success \
         'pushing with --force should be denied with denyNonFastforwards' '
        cd victim &&
-       git-repo-config receive.denyNonFastforwards true &&
+       git-config receive.denyNonFastforwards true &&
        cd .. &&
-       git-update-ref refs/heads/master master^ &&
-       git-send-pack --force ./victim/.git/ master &&
-       ! diff -u .git/refs/heads/master victim/.git/refs/heads/master
+       git-update-ref refs/heads/master master^ || return 1
+       git-send-pack --force ./victim/.git/ master && return 1
+       ! diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done