From 5a57bc6bfc5a4d33aa90eace0016bbe768e09a4d Mon Sep 17 00:00:00 2001 From: Elijah Newren <newren@gmail.com> Date: Sun, 3 Oct 2010 14:00:04 -0600 Subject: [PATCH] t4202 (log): Replace '<git-command> || :' 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 <avarab@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- 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 2e513569477..1172e4540ef 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 &&