diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-07-27 20:48:11 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-30 21:18:41 +0300 |
commit | d3c6751b18170276f80e3578d16877d43ad22709 (patch) | |
tree | 6fbc19983489ba653109c8bee1b47d95254e7027 /t/t6022-merge-rename.sh | |
parent | ffc6fa0e396238de3a30623912980263b4f283ab (diff) |
tests: make use of the test_must_be_empty function
Change various tests that use an idiom of the form:
>expect &&
test_cmp expect actual
To instead use:
test_must_be_empty actual
The test_must_be_empty() wrapper was introduced in ca8d148daf ("test:
test_must_be_empty helper", 2013-06-09). Many of these tests have been
added after that time. This was mostly found with, and manually pruned
from:
git grep '^\s+>.*expect.* &&$' t
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6022-merge-rename.sh')
-rwxr-xr-x | t/t6022-merge-rename.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh index b760c223c6..53cc9b2ffb 100755 --- a/t/t6022-merge-rename.sh +++ b/t/t6022-merge-rename.sh @@ -893,8 +893,7 @@ test_expect_success 'do not follow renames for empty files' ' git mv empty1 empty2 && git commit -m rename && test_must_fail git merge empty-base && - >expect && - test_cmp expect empty2 + test_must_be_empty empty2 ' test_done |