[PATCH 1/2] Make the indent heuristic part of diff's basic configuration.
From: Marc Branchaud <hidden>
Date: 2017-04-27 20:59:53
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Marc Branchaud <redacted> --- diff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index 11eef1c85..da96577ea 100644
--- a/diff.c
+++ b/diff.c@@ -290,9 +290,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) return 0; } - if (git_diff_heuristic_config(var, value, cb) < 0) - return -1; - if (!strcmp(var, "diff.wserrorhighlight")) { int val = parse_ws_error_highlight(value); if (val < 0)
@@ -351,6 +348,9 @@ int git_diff_basic_config(const char *var, const char *value, void *cb) if (starts_with(var, "submodule.")) return parse_submodule_config_option(var, value); + if (git_diff_heuristic_config(var, value, cb) < 0) + return -1; + return git_default_config(var, value, cb); }
--
2.13.0.rc1.15.g7dbea34e1.dirty