From: Jeff King Date: Tue, 3 Oct 2017 13:44:39 +0000 (-0400) Subject: t3203: drop "always" color test X-Git-Tag: v2.15.0-rc1~18^2^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e10b3810be4c98100930ad5f3aa4b6e3343d7398;p=thirdparty%2Fgit.git t3203: drop "always" color test In preparation for the behavior of "always" changing to match "auto", we can simply drop this test. We already check other forms (like "--color") independently. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh index 86286f263d..ee6787614c 100755 --- a/t/t3203-branch-output.sh +++ b/t/t3203-branch-output.sh @@ -258,12 +258,6 @@ test_expect_success TTY '%(color) present with tty' ' test_cmp expect.color actual ' -test_expect_success 'color.branch=always overrides auto-color' ' - git -c color.branch=always branch $color_args >actual.raw && - test_decode_color actual && - test_cmp expect.color actual -' - test_expect_success '--color overrides auto-color' ' git branch --color $color_args >actual.raw && test_decode_color actual &&