[PATCHv3 4/4] add--interactive: drop diff.indentHeuristic handling
From: Marc Branchaud <hidden>
Date: 2017-05-01 22:14:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Marc Branchaud <hidden>
Date: 2017-05-01 22:14:02
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Jeff King <redacted> Now that diff.indentHeuristic is handled automatically by the plumbing commands, there's no need to propagate it manually. Signed-off-by: Jeff King <redacted> Signed-off-by: Marc Branchaud <redacted> --- git-add--interactive.perl | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 709a5f6ce..79d675b5b 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl@@ -46,7 +46,6 @@ my ($diff_new_color) = my $normal_color = $repo->get_color("", "reset"); my $diff_algorithm = $repo->config('diff.algorithm'); -my $diff_indent_heuristic = $repo->config_bool('diff.indentheuristic'); my $diff_filter = $repo->config('interactive.difffilter'); my $use_readkey = 0;
@@ -730,9 +729,6 @@ sub parse_diff { if (defined $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) { push @diff_cmd, get_diff_reference($patch_mode_revision); }
--
2.13.0.rc1.15.gf67d331ad