зеркало из https://github.com/microsoft/git.git
add--interactive: respect diff.compactionHeuristic
We use plumbing to generate the diff, so it doesn't automatically pick up UI config like compactionHeuristic. Let's forward it on, since interactive adding is porcelain. Note that we only need to handle the "true" case. There's no point in passing --no-compaction-heuristic when the variable is false, since nothing else could have turned it on. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
e5f7675544
Коммит
46e3d17f57
|
@ -45,6 +45,7 @@ my ($diff_new_color) =
|
|||
my $normal_color = $repo->get_color("", "reset");
|
||||
|
||||
my $diff_algorithm = $repo->config('diff.algorithm');
|
||||
my $diff_compaction_heuristic = $repo->config_bool('diff.compactionheuristic');
|
||||
my $diff_filter = $repo->config('interactive.difffilter');
|
||||
|
||||
my $use_readkey = 0;
|
||||
|
@ -749,6 +750,9 @@ sub parse_diff {
|
|||
if (defined $diff_algorithm) {
|
||||
splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
|
||||
}
|
||||
if ($diff_compaction_heuristic) {
|
||||
splice @diff_cmd, 1, 0, "--compaction-heuristic";
|
||||
}
|
||||
if (defined $patch_mode_revision) {
|
||||
push @diff_cmd, get_diff_reference($patch_mode_revision);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче