From: Elijah Newren <newren@gmail.com>
Date: Sun, 3 Oct 2010 20:00:07 +0000 (-0600)
Subject: t4026 (color): remove unneeded and unchained command
X-Git-Tag: v1.7.4-rc0~65^2~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5935c581df1d908c8adc293d92a8bf1da5be9005;p=git.git

t4026 (color): remove unneeded and unchained command

Ever since 8b12413 (color: allow multiple attributes 2010-02-27),
diff.color.new has been unused in t4026, so also remove the final unsetting
of that value to make the third to last test pass with appropriate
'&&' chaining.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index d5ccdd0cf..3726a0e20 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -74,7 +74,6 @@ test_expect_success 'extra character after attribute' '
 '
 
 test_expect_success 'unknown color slots are ignored (diff)' '
-	git config --unset diff.color.new
 	git config color.diff.nosuchslotwilleverbedefined white &&
 	git diff --color
 '