From 5a57bc6bfc5a4d33aa90eace0016bbe768e09a4d Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sun, 3 Oct 2010 14:00:04 -0600 Subject: [PATCH] t4202 (log): Replace ' || :' with test_might_fail MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Ævar Arnfjörð Bjarmason Reviewed-by: Jonathan Nieder Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- t/t4202-log.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 2e51356947..1172e4540e 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -393,7 +393,7 @@ test_expect_success 'log --graph with merge' ' ' test_expect_success 'log.decorate configuration' ' - git config --unset-all log.decorate || : + test_might_fail git config --unset-all log.decorate && git log --oneline >expect.none && git log --oneline --decorate >expect.short &&