Merge branch 'maint'

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index b1c97b0dfb1748a7ba80c18d2d4b84bdee192c95..4eaea8f3364343385227b38ac279a603f7ca025b 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -66,7 +66,7 @@ test_expect_success 'pack the destination repository' '
 '
 
 test_expect_success \
-        'pushing rewound head should not barf but require --force' ' 
+        'pushing rewound head should not barf but require --force' '
        # should not fail but refuse to update.
        if git-send-pack ./victim/.git/ master
        then
@@ -110,7 +110,7 @@ test_expect_success \
        cd .. &&
        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
+       ! git diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done