diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-10 15:24:27 -0800 |
| commit | 2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d (patch) | |
| tree | 119f95fb9e29fc40c111984b0ab51f75d2a65f68 /git-add--interactive.perl | |
| parent | 42087233c35793a3c2279dd4deab9d021142f100 (diff) | |
| parent | 3cde4e02ee891bff53bac7f6a7d977f50418a4b5 (diff) | |
| download | git-2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d.tar.gz | |
Merge branch 'jc/retire-compaction-heuristics'
"git diff" and its family had two experimental heuristics to shift
the contents of a hunk to make the patch easier to read. One of
them turns out to be better than the other, so leave only the
"--indent-heuristic" option and remove the other one.
* jc/retire-compaction-heuristics:
diff: retire "compaction" heuristics
Diffstat (limited to 'git-add--interactive.perl')
| -rwxr-xr-x | git-add--interactive.perl | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 4e0ab5a9bc..cf6fc926ab 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl @@ -47,7 +47,6 @@ 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_compaction_heuristic = $repo->config_bool('diff.compactionheuristic'); my $diff_filter = $repo->config('interactive.difffilter'); my $use_readkey = 0; @@ -742,8 +741,6 @@ sub parse_diff { } if ($diff_indent_heuristic) { splice @diff_cmd, 1, 0, "--indent-heuristic"; - } elsif ($diff_compaction_heuristic) { - splice @diff_cmd, 1, 0, "--compaction-heuristic"; } if (defined $patch_mode_revision) { push @diff_cmd, get_diff_reference($patch_mode_revision); |