From af1d954b2d3115dc0cf6e647df94ff2b7082d4ea Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 28 Jul 2015 21:21:26 +0200 Subject: [PATCH] fixup! Work around a problem identified by BuildHive --- t/t5504-fetch-receive-strict.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh index bb8bc94bfc..ca5d629d48 100755 --- a/t/t5504-fetch-receive-strict.sh +++ b/t/t5504-fetch-receive-strict.sh @@ -101,7 +101,10 @@ test_expect_success 'push with receive.fsckobjects' ' git config transfer.fsckobjects false ) && test_must_fail git push --porcelain dst master:refs/heads/test >act && - test_cmp exp act || test ! -s act + if ! test_cmp exp act + then + test ! -s act + fi ' test_expect_success 'push with transfer.fsckobjects' ' @@ -112,7 +115,10 @@ test_expect_success 'push with transfer.fsckobjects' ' git config transfer.fsckobjects true ) && test_must_fail git push --porcelain dst master:refs/heads/test >act && - test_cmp exp act || test ! -s act + if ! test_cmp exp act + then + test ! -s act + fi ' test_done