aboutsummaryrefslogtreecommitdiff
path: root/t/t6037-merge-ours-theirs.sh
diff options
context:
space:
mode:
authorJared Hance <jaredhance@gmail.com>2010-07-20 19:18:34 -0400
committerJunio C Hamano <gitster@pobox.com>2010-07-20 16:47:17 -0700
commitce14e0b264b31dd02a0c9d1688bceb6579d052fa (patch)
tree6496dde81c7a512ee30b90afff7f5c9914093dfb /t/t6037-merge-ours-theirs.sh
parentc5212b87dafb3f559ceb898bd9b40bfc3cd0ad68 (diff)
downloadgit-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/t6037-merge-ours-theirs.sh')
-rwxr-xr-xt/t6037-merge-ours-theirs.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 8ab3d61f4..2cf42c73f 100755
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -58,7 +58,7 @@ test_expect_success 'pull with -X' '
git reset --hard master && git pull -s recursive -X ours . side &&
git reset --hard master && git pull -s recursive -Xtheirs . side &&
git reset --hard master && git pull -s recursive -X theirs . side &&
- git reset --hard master && ! git pull -s recursive -X bork . side
+ git reset --hard master && test_must_fail git pull -s recursive -X bork . side
'
test_done