From: Jeff King Date: Tue, 03 Oct 2017 13:44:39 GMT Subject: [PATCH 08/12] t3203: drop "always" color test Message-ID: <20171003134438.fmjc5nziuw24hnot@sigill.intra.peff.net> In-Reply-To: <20171003133713.ccxv6clrmuuhhc3u@sigill.intra.peff.net> 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 --- t/t3203-branch-output.sh | 6 ------ 1 file changed, 6 deletions(-) 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 && -- 2.14.2.1079.gce6b466188