[PATCH 2/6] merge-trees: let caller decide whether to renormalize
From: Jonathan Nieder <hidden>
Date: 2016-06-15 22:49:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Add a "renormalize" option to struct merge_options so callers can decide on a case-by-case basis whether the merge is likely to have overlapped with a change in smudge/clean rules. The option defaults to the global merge_renormalize setting for now. No change in behavior intended. Cc: Eyvind Bernhardsen <redacted> Signed-off-by: Jonathan Nieder <redacted> --- merge-recursive.c | 3 ++- merge-recursive.h | 1 + 2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 2b55fc2..8a49844 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c@@ -1112,7 +1112,7 @@ static int process_entry(struct merge_options *o, print_index_entry("\tpath: ", entry); */ int clean_merge = 1; - int normalize = merge_renormalize; + int normalize = o->renormalize; unsigned o_mode = entry->stages[1].mode; unsigned a_mode = entry->stages[2].mode; unsigned b_mode = entry->stages[3].mode;
@@ -1484,6 +1484,7 @@ void init_merge_options(struct merge_options *o) o->buffer_output = 1; o->diff_rename_limit = -1; o->merge_rename_limit = -1; + o->renormalize = merge_renormalize; git_config(merge_recursive_config, o); if (getenv("GIT_MERGE_VERBOSITY")) o->verbosity =
diff --git a/merge-recursive.h b/merge-recursive.h
index b831293..cdb97e9 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h@@ -17,6 +17,7 @@ struct merge_options { int verbosity; int diff_rename_limit; int merge_rename_limit; + int renormalize; int call_depth; struct strbuf obuf; struct string_list current_file_set;
--
1.7.2.1.544.ga752d.dirty