On Sat, Apr 29, 2017 at 08:40:52AM -0400, Jeff King wrote:
> On Fri, Apr 28, 2017 at 06:33:12PM -0400, Marc Branchaud wrote:
>
> > v2: Fixed up the commit messages and added tests.
> >
> > Marc Branchaud (2):
> > diff: make the indent heuristic part of diff's basic configuration
> > diff: have the diff-* builtins configure diff before initializing
> > revisions
> >
> > Stefan Beller (1):
> > diff: enable indent heuristic by default
>
> Thanks, these look fine to me. I'd like to get an ACK from Michael, in
> case he had some other reason for omitting them from git_diff_ui_config
> (from my recollection, it's probably just a mix of conservatism and
> following what the compaction heuristic had done).
We can also do this simplification on top (once the other test problems
are fixed, of course).
-- >8 --
Subject: add--interactive: drop diff.indentHeuristic handling
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@xxxxxxxx>
---
I actually wonder if diff.algorithm should go into git_diff_basic_config
by the same rationale as the rest of this series.
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.407.g644207685