From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Fabian Ruch <bafain@gmail.com>
Subject: [PATCH v2 2/2] t1503: use test_must_be_empty
Date: Sun, 14 Sep 2014 12:03:02 -0700 [thread overview]
Message-ID: <1410721382-97751-2-git-send-email-davvid@gmail.com> (raw)
In-Reply-To: <1410721382-97751-1-git-send-email-davvid@gmail.com>
Use `test_must_be_be_empty <file>` instead of `test -z "$(cat <file>)"`.
Suggested-by: Fabian Ruch <bafain@gmail.com>
Signed-off-by: David Aguilar <davvid@gmail.com>
---
t/t1503-rev-parse-verify.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index ab9878d..9ac4627 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -72,22 +72,22 @@ test_expect_success 'fails with any bad rev or many good revs' '
test_expect_success 'fails silently when using -q' '
test_must_fail git rev-parse --verify --quiet 2>error &&
- test -z "$(cat error)" &&
+ test_must_be_empty error &&
test_must_fail git rev-parse -q --verify foo 2>error &&
- test -z "$(cat error)" &&
+ test_must_be_empty error &&
test_must_fail git rev-parse --verify -q HEAD bar 2>error &&
- test -z "$(cat error)" &&
+ test_must_be_empty error &&
test_must_fail git rev-parse --quiet --verify baz HEAD 2>error &&
- test -z "$(cat error)" &&
+ test_must_be_empty error &&
test_must_fail git rev-parse -q --verify $HASH2 HEAD 2>error &&
- test -z "$(cat error)"
+ test_must_be_empty error
'
test_expect_success 'fails silently when using -q with deleted reflogs' '
git branch test &&
git reflog delete --updateref --rewrite test@{0} &&
test_must_fail git rev-parse -q --verify test@{0} >error 2>&1 &&
- test -z "$(cat error)"
+ test_must_be_empty error
'
test_expect_success 'no stdout output on error' '
--
2.1.0.30.g05c535b.dirty
prev parent reply other threads:[~2014-09-14 19:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-14 19:03 [PATCH v2 1/2] t1503: test rev-parse --verify --quiet with deleted reflogs David Aguilar
2014-09-14 19:03 ` David Aguilar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410721382-97751-2-git-send-email-davvid@gmail.com \
--to=davvid@gmail.com \
--cc=bafain@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).