From ce14e0b264b31dd02a0c9d1688bceb6579d052fa Mon Sep 17 00:00:00 2001 From: Jared Hance Date: Tue, 20 Jul 2010 19:18:34 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- t/t1001-read-tree-m-2way.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t1001-read-tree-m-2way.sh') diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 0c562bb820..93ca84f9e6 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -359,7 +359,7 @@ test_expect_success \ test_expect_success \ 'a/b (untracked) vs a, plus c/d case test.' \ - '! git read-tree -u -m "$treeH" "$treeM" && + 'test_must_fail git read-tree -u -m "$treeH" "$treeM" && git ls-files --stage && test -f a/b' -- cgit v1.2.3