t7004: ship trustdb to avoid gpg warnings
[gitweb.git] / t / t5400-send-pack.sh
index 7d93d0d7c90de94b0972d8fa5cd6d747c3fd2f56..4eaea8f3364343385227b38ac279a603f7ca025b 100755 (executable)
@@ -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
@@ -108,9 +108,9 @@ test_expect_success \
        cd victim &&
        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
+       ! git diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done