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

add--interactive: drop diff.indentHeuristic handling

Browse Source 
Now that diff.indentHeuristic is handled automatically by the plumbing
commands, there's no need to propagate it manually.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-05-08 12:03:39 -04:00 committed by Junio C Hamano
parent 33de716387
commit 1fa8a66bf7
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-add--interactive.perl
View File

@ -46,7 +46,6 @@ my ($diff_new_color) =
my $normal_color = $repo->get_color("", "reset"); my $normal_color = $repo->get_color("", "reset");
my $diff_algorithm = $repo->config('diff.algorithm'); my $diff_algorithm = $repo->config('diff.algorithm');
my $diff_indent_heuristic = $repo->config_bool('diff.indentheuristic');
my $diff_filter = $repo->config('interactive.difffilter'); my $diff_filter = $repo->config('interactive.difffilter');
my $use_readkey = 0; my $use_readkey = 0;
@ -730,9 +729,6 @@ sub parse_diff {
if (defined $diff_algorithm) { if (defined $diff_algorithm) {
splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}"; splice @diff_cmd, 1, 0, "--diff-algorithm=${diff_algorithm}";
} }
if ($diff_indent_heuristic) {
splice @diff_cmd, 1, 0, "--indent-heuristic";
}
if (defined $patch_mode_revision) { if (defined $patch_mode_revision) {
push @diff_cmd, get_diff_reference($patch_mode_revision); push @diff_cmd, get_diff_reference($patch_mode_revision);
} }