diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-27 14:33:43 -0700 |
| commit | 986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a (patch) | |
| tree | 4ef3f9805cfdbf3b4496cb720a94c138df034204 /t/t3404-rebase-interactive.sh | |
| parent | fc0df933c8fa09603a9e9798085ee07ca1a83f65 (diff) | |
| parent | 1c5e94f459a0b7c23ef7e855441a65afdc4effab (diff) | |
| download | git-986c5181071ce3aac42d0aaeb7bd691a1a0bdf4a.tar.gz | |
Merge branch 'sg/test-must-be-empty'
Test fixes.
* sg/test-must-be-empty:
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
tests: use 'test_must_be_empty' instead of 'test_cmp /dev/null <out>'
tests: use 'test_must_be_empty' instead of 'test ! -s'
tests: use 'test_must_be_empty' instead of '! test -s'
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 4c7b1ea356..259c27233d 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -796,16 +796,15 @@ test_expect_success 'always cherry-pick with --no-ff' ' git tag original-no-ff-branch && set_fake_editor && git rebase -i --no-ff A && - touch empty && for p in 0 1 2 do test ! $(git rev-parse HEAD~$p) = $(git rev-parse original-no-ff-branch~$p) && git diff HEAD~$p original-no-ff-branch~$p > out && - test_cmp empty out + test_must_be_empty out done && test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) && git diff HEAD~3 original-no-ff-branch~3 > out && - test_cmp empty out + test_must_be_empty out ' test_expect_success 'set up commits with funny messages' ' |