зеркало из https://github.com/microsoft/git.git
add--interactive: remove unused diff colors
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:
Родитель
a0393ef676
Коммит
50e3d1eeff
|
@ -6,7 +6,7 @@ use Git;
|
|||
# Prompt colors:
|
||||
my ($prompt_color, $header_color, $help_color, $normal_color);
|
||||
# Diff colors:
|
||||
my ($new_color, $old_color, $fraginfo_color, $metainfo_color, $whitespace_color);
|
||||
my ($fraginfo_color);
|
||||
|
||||
my ($use_color, $diff_use_color);
|
||||
my $repo = Git->repository();
|
||||
|
@ -26,11 +26,7 @@ if ($use_color) {
|
|||
# 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");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче