t5516: Use test_cmp when appropriate

Consistently using test_cmp would make debugging test scripts far easier,
as output from them run under "-v" option becomes readable.

Besides, some platforms' "diff" implementations lack "-q" option.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 11adb0b0edcc0cbc6d193a411ac40dada7ca739d..2de98e6561607b87bceef66c20ad9055d04878c3 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -672,7 +672,7 @@ test_expect_success 'push --porcelain' '
                test "z$r" = "z$the_commit" &&
                test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
        ) &&
                test "z$r" = "z$the_commit" &&
                test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
        ) &&

-       diff -q .git/foo .git/bar
+       test_cmp .git/foo .git/bar

 '
 
 test_expect_success 'push --porcelain bad url' '
 '
 
 test_expect_success 'push --porcelain bad url' '


@@ -692,7 +692,7 @@ test_expect_success 'push --porcelain rejected' '
        echo >>.git/foo "!      refs/heads/master:refs/heads/master     [remote rejected] (branch is currently checked out)" &&
 
        test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/master:refs/heads/master &&
        echo >>.git/foo "!      refs/heads/master:refs/heads/master     [remote rejected] (branch is currently checked out)" &&
 
        test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/master:refs/heads/master &&

-       diff -q .git/foo .git/bar
+       test_cmp .git/foo .git/bar

 '
 
 test_expect_success 'push --porcelain --dry-run rejected' '
 '
 
 test_expect_success 'push --porcelain --dry-run rejected' '


@@ -707,7 +707,7 @@ test_expect_success 'push --porcelain --dry-run rejected' '
        echo >>.git/foo "Done" &&
 
        test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/master^:refs/heads/master &&
        echo >>.git/foo "Done" &&
 
        test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/master^:refs/heads/master &&

-       diff -q .git/foo .git/bar
+       test_cmp .git/foo .git/bar

 '
 
 test_done
 '
 
 test_done