Andrew's git / gitweb.git / diff
?
t4202 (log): Replace '<git-command> || :' with test_might_fail
authorElijah Newren <newren@gmail.com>
Sun, 3 Oct 2010 20:00:04 +0000 (14:00 -0600)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Oct 2010 20:26:12 +0000 (13:26 -0700)
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 patch | blob | history
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 2e513569477bb5efc389a2088a4d896620e50b8f..1172e4540ef5963080827643e8a95ea037cf60e1 100755 (executable)
--- 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 &&