diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-18 23:12:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-18 23:12:15 (GMT) |
| commit | c7f352f31ad0593f7772a155980b16cbbaac3dec (patch) | |
| tree | c64eb97b8d3846244a534e36ba89093c070da124 /t/t3510-cherry-pick-sequence.sh | |
| parent | fe9ec8bdf65657c11f08f8858bb2a707bdf7aafe (diff) | |
| parent | c6f44e1da5e88e34654ae37c62eea2d08835110b (diff) | |
| download | git-c7f352f31ad0593f7772a155980b16cbbaac3dec.zip git-c7f352f31ad0593f7772a155980b16cbbaac3dec.tar.gz git-c7f352f31ad0593f7772a155980b16cbbaac3dec.tar.bz2 | |
Merge branch 'pb/test-must-fail-is-for-git'
Test cleanup.
* pb/test-must-fail-is-for-git:
t9813: avoid using pipes
don't use test_must_fail with grep
Diffstat (limited to 't/t3510-cherry-pick-sequence.sh')
| -rwxr-xr-x | t/t3510-cherry-pick-sequence.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 372307c..0acf4b1 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -385,7 +385,7 @@ test_expect_success '--continue respects opts' ' git cat-file commit HEAD~1 >picked_msg && git cat-file commit HEAD~2 >unrelatedpick_msg && git cat-file commit HEAD~3 >initial_msg && - test_must_fail grep "cherry picked from" initial_msg && + ! grep "cherry picked from" initial_msg && grep "cherry picked from" unrelatedpick_msg && grep "cherry picked from" picked_msg && grep "cherry picked from" anotherpick_msg @@ -426,9 +426,9 @@ test_expect_failure '--signoff is automatically propagated to resolved conflict' git cat-file commit HEAD~1 >picked_msg && git cat-file commit HEAD~2 >unrelatedpick_msg && git cat-file commit HEAD~3 >initial_msg && - test_must_fail grep "Signed-off-by:" initial_msg && + ! grep "Signed-off-by:" initial_msg && grep "Signed-off-by:" unrelatedpick_msg && - test_must_fail grep "Signed-off-by:" picked_msg && + ! grep "Signed-off-by:" picked_msg && grep "Signed-off-by:" anotherpick_msg ' |