From: Jeff King Date: Fri, 04 Jan 2008 08:35:21 GMT Subject: [PATCH] add--interactive: allow diff colors without interactive colors Message-ID: <20080104083521.GB3354@coredump.intra.peff.net> Users with color.diff set to true/auto will not see color in "git add -i" unless they also set color.interactive. However, some users may want just one without the other, so there's no reason to tie them together. Note that there is now no way to have color on for "git diff" but not for diffs from "git add -i"; such a configuration seems unlikely, though. Signed-off-by: Jeff King --- git-add--interactive.perl | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 0cdd800..aaa9b24 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -22,16 +22,16 @@ if ($use_color) { $header_color = $repo->get_color("color.interactive.header", "bold"); $help_color = $repo->get_color("color.interactive.help", "red bold"); $normal_color = $repo->get_color("", "reset"); +} - # Do we also set diff colors? - $diff_use_color = $repo->get_colorbool('color.diff'); - if ($diff_use_color) { - $new_color = $repo->get_color("color.diff.new", "green"); - $old_color = $repo->get_color("color.diff.old", "red"); - $fraginfo_color = $repo->get_color("color.diff.frag", "cyan"); - $metainfo_color = $repo->get_color("color.diff.meta", "bold"); - $whitespace_color = $repo->get_color("color.diff.whitespace", "normal red"); - } +# Do we also set diff colors? +$diff_use_color = $repo->get_colorbool('color.diff'); +if ($diff_use_color) { + $new_color = $repo->get_color("color.diff.new", "green"); + $old_color = $repo->get_color("color.diff.old", "red"); + $fraginfo_color = $repo->get_color("color.diff.frag", "cyan"); + $metainfo_color = $repo->get_color("color.diff.meta", "bold"); + $whitespace_color = $repo->get_color("color.diff.whitespace", "normal red"); } sub colored { -- 1.5.4.rc2.1122.g6954-dirty