undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add--interactive: remove unused diff colors

Browse Source 
When color support was added, we colored the diffs ourselves.
However, 4af756f3 changed this to simply run "git diff-files"
twice, keeping the colored output separately.

This makes the internal diff color variables obsolete with
one exception: when splitting hunks, we have to manually
recreate the fragment for each part of the split. Thus we
keep $fraginfo_color around to do that correctly.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2008-01-05 23:24:09 -05:00 committed by Junio C Hamano
parent a0393ef676
commit 50e3d1eeff
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git-add--interactive.perl
View File

@ -6,7 +6,7 @@ use Git;
# Prompt colors: # Prompt colors:
my ($prompt_color, $header_color, $help_color, $normal_color); my ($prompt_color, $header_color, $help_color, $normal_color);
# Diff colors: # Diff colors:
my ($new_color, $old_color, $fraginfo_color, $metainfo_color, $whitespace_color); my ($fraginfo_color);
my ($use_color, $diff_use_color); my ($use_color, $diff_use_color);
my $repo = Git->repository(); my $repo = Git->repository();
@ -26,11 +26,7 @@ if ($use_color) {
# Do we also set diff colors? # Do we also set diff colors?
$diff_use_color = $repo->get_colorbool('color.diff'); $diff_use_color = $repo->get_colorbool('color.diff');
if ($diff_use_color) { 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"); $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");
} }
} }