diff options
| author | Jared Hance <jaredhance@gmail.com> | 2010-07-20 19:18:34 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-07-20 16:47:17 -0700 |
| commit | ce14e0b264b31dd02a0c9d1688bceb6579d052fa (patch) | |
| tree | 6496dde81c7a512ee30b90afff7f5c9914093dfb /t/t3410-rebase-preserve-dropped-merges.sh | |
| parent | c5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (diff) | |
| download | git-ce14e0b264b31dd02a0c9d1688bceb6579d052fa.tar.gz git-ce14e0b264b31dd02a0c9d1688bceb6579d052fa.tar.xz | |
Convert "! git" to "test_must_fail git"
test_must_fail will account for segfaults in git, so it should be used
instead of "! git"
This patch does not change any of the commands that use pipes.
Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3410-rebase-preserve-dropped-merges.sh')
| -rwxr-xr-x | t/t3410-rebase-preserve-dropped-merges.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3410-rebase-preserve-dropped-merges.sh b/t/t3410-rebase-preserve-dropped-merges.sh index c49143a1a..6f73b9555 100755 --- a/t/t3410-rebase-preserve-dropped-merges.sh +++ b/t/t3410-rebase-preserve-dropped-merges.sh @@ -43,11 +43,11 @@ test_expect_success 'setup' ' # G2 = same changes as G test_expect_success 'skip same-resolution merges with -p' ' git checkout H && - ! git merge E && + test_must_fail git merge E && test_commit L file1 23 && git checkout I && test_commit G2 file1 3 && - ! git merge E && + test_must_fail git merge E && test_commit J file1 23 && test_commit K file7 file7 && git rebase -i -p L && @@ -65,11 +65,11 @@ test_expect_success 'skip same-resolution merges with -p' ' # G2 = different changes as G test_expect_success 'keep different-resolution merges with -p' ' git checkout H && - ! git merge E && + test_must_fail git merge E && test_commit L2 file1 23 && git checkout I && test_commit G3 file1 4 && - ! git merge E && + test_must_fail git merge E && test_commit J2 file1 24 && test_commit K2 file7 file7 && test_must_fail git rebase -i -p L2 && |