diff options
| author | Jeff King <peff@peff.net> | 2017-05-08 12:03:39 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-09 12:24:35 +0900 |
| commit | 1fa8a66bf76953c6fb9cfe5e17b26a3a0920f538 (patch) | |
| tree | d4cfe8cc9f773de0e18367c42c330acc614035ff | |
| parent | 33de7163879ca83be7d6e1583c125f84e1e7c329 (diff) | |
| download | git-1fa8a66bf76953c6fb9cfe5e17b26a3a0920f538.tar.gz | |
add--interactive: drop diff.indentHeuristic handlingmb/diff-default-to-indent-heuristics
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>
| -rwxr-xr-x | git-add--interactive.perl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 709a5f6ce6..79d675b5b0 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); } |