summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2010-10-03 14:00:07 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-06 13:26:12 -0700
commit5935c581df1d908c8adc293d92a8bf1da5be9005 (patch)
tree2748af317f3e9ea04622b2ad3b212b5ee9d145d1
parentt4019 (diff-wserror): add lots of missing && (diff)
downloadtgif-5935c581df1d908c8adc293d92a8bf1da5be9005.tar.xz
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>
-rwxr-xr-xt/t4026-color.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index d5ccdd0cf8..3726a0e201 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
'