From: Junio C Hamano Date: Fri, 12 Mar 2010 05:51:57 +0000 (-0800) Subject: t5516: Use test_cmp when appropriate X-Git-Tag: v1.7.1-rc0~67^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c296134d038fe6d836fe3848e0b342d920933683;p=git.git 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 --- diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 11adb0b0e..2de98e656 100755 --- 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) ) && - diff -q .git/foo .git/bar + test_cmp .git/foo .git/bar ' 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 && - diff -q .git/foo .git/bar + test_cmp .git/foo .git/bar ' 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 && - diff -q .git/foo .git/bar + test_cmp .git/foo .git/bar ' test_done