merge-trees: let caller decide whether to renormalize

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 <eyvind.bernhardsen@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Aug 5, 2010 at 06:15 UTC 1bc0ab7cd13af796b4ba1a5fc3ede9e92078aee4

2 files changed +3 -1

merge-recursive.c

+2 -1

@@ -1112,7 +1112,7 @@ static int process_entry(struct merge_options *o,

1112 print_index_entry("\tpath: ", entry);

1113 */

1114 int clean_merge = 1;

1115 - int normalize = merge_renormalize;

1115 + int normalize = o->renormalize;

1116 unsigned o_mode = entry->stages[1].mode;

1117 unsigned a_mode = entry->stages[2].mode;

1118 unsigned b_mode = entry->stages[3].mode;

@@ -1484,6 +1484,7 @@ void init_merge_options(struct merge_options *o)

1484 o->buffer_output = 1;

1485 o->diff_rename_limit = -1;

1486 o->merge_rename_limit = -1;

1487 + o->renormalize = merge_renormalize;

1488 git_config(merge_recursive_config, o);

1489 if (getenv("GIT_MERGE_VERBOSITY"))

1490 o->verbosity =

merge-recursive.h

@@ -14,6 +14,7 @@ struct merge_options {

14 } recursive_variant;

15 const char *subtree_shift;

16 unsigned buffer_output : 1;

17 + unsigned renormalize : 1;

18 int verbosity;

19 int diff_rename_limit;

20 int merge_rename_limit;