t3203: drop "always" color test
authorJeff King <peff@peff.net>
Tue, 3 Oct 2017 13:44:39 +0000 (09:44 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Oct 2017 02:32:56 +0000 (11:32 +0900)
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3203-branch-output.sh
index 86286f263dd6d0b0e4b1de1a64f6dc0183d37d27..ee6787614c80edb9b5b24065277dd413350a6fc6 100755 (executable)
@@ -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.raw >actual &&
-       test_cmp expect.color actual
-'
-
 test_expect_success '--color overrides auto-color' '
        git branch --color $color_args >actual.raw &&
        test_decode_color <actual.raw >actual &&