diff: make the indent heuristic part of diff's basic configuration
This heuristic was originally introduced as an experimental feature, and therefore part of the UI configuration. But the user often sees diffs generated by plumbing commands like diff-tree. Moving the indent heuristic into diff's basic configuration prepares the way for diff plumbing commands to respect the setting. The heuristic itself merely makes the diffs more aesthetically pleasing, without changing their correctness. Scripts that rely on the diff plumbing commands should not care whether or not the heuristic is employed. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marc Branchaud committed
May 8, 2017 at 12:03 UTC
cf5e77223a012737930e1bbacc85c6423b03af77
1 file changed
+3
-3
diff.c
+3
-3
@@ -290,9 +290,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
290
return 0;
291
}
292
293
- if (git_diff_heuristic_config(var, value, cb) < 0)
294
- return -1;
295
-
293
if (!strcmp(var, "diff.wserrorhighlight")) {
294
int val = parse_ws_error_highlight(value);
295
if (val < 0)
@@ -351,6 +348,9 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
348
if (starts_with(var, "submodule."))
349
return parse_submodule_config_option(var, value);
350
351
+ if (git_diff_heuristic_config(var, value, cb) < 0)
352
+ return -1;
353
+
354
return git_default_config(var, value, cb);
355
}
356