David Aguilar <davvid@xxxxxxxxx> writes:
> Use `test_must_be_be_empty <file>` instead of `test -z "$(cat <file>)"`.
>
> Suggested-by: Fabian Ruch <bafain@xxxxxxxxx>
> Signed-off-by: David Aguilar <davvid@xxxxxxxxx>
> ---
> Unchanged since last time, but rebased for the change in the
> previous patch.
It probably makes more sense to have this at the beginning of a
series as preliminary clean-up. That way, the more interesting
change does not have to have "test -z $(cat ...)" that makes readers
go "Huh?".
>
> 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 fd9d0c3..4fe9f0e 100755
> --- a/t/t1503-rev-parse-verify.sh
> +++ b/t/t1503-rev-parse-verify.sh
> @@ -72,15 +72,15 @@ 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' '
> @@ -89,7 +89,7 @@ test_expect_success 'fails silently when using -q with deleted reflogs' '
> git update-ref -m "reflog message for refs/test" refs/test "$ref" &&
> git reflog delete --updateref --rewrite refs/test@{0} &&
> test_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&
> - test -z "$(cat error)"
> + test_must_be_empty error
> '
>
> test_expect_success 'no stdout output on error' '
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html