summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0564b3e)
raw | patch | inline | side by side (parent: 0564b3e)
author | Elijah Newren <newren@gmail.com> | |
Sun, 3 Oct 2010 20:00:07 +0000 (14:00 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 6 Oct 2010 20:26:12 +0000 (13:26 -0700) |
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.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>
t/t4026-color.sh | patch | blob | history |
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index d5ccdd0cf8061e797e88185bfddb0864f73291dd..3726a0e2012e534623ddbdd71da04f177c32d4d0 100755 (executable)
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
'
test_expect_success 'unknown color slots are ignored (diff)' '
- git config --unset diff.color.new
git config color.diff.nosuchslotwilleverbedefined white &&
git diff --color
'