summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2017-10-03 09:44:39 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-04 11:32:56 +0900
commite10b3810be4c98100930ad5f3aa4b6e3343d7398 (patch)
treea18b11e4b60eb64c7054f9a95175611b18ef786e
parentt6006: drop "always" color config tests (diff)
downloadtgif-e10b3810be4c98100930ad5f3aa4b6e3343d7398.tar.xz
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3203-branch-output.sh6
1 files changed, 0 insertions, 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.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 &&