зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
3e7589b7b3
Коммит
1bc0ab7cd1
|
@ -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 =
|
||||
|
|
|
@ -14,6 +14,7 @@ struct merge_options {
|
|||
} recursive_variant;
|
||||
const char *subtree_shift;
|
||||
unsigned buffer_output : 1;
|
||||
unsigned renormalize : 1;
|
||||
int verbosity;
|
||||
int diff_rename_limit;
|
||||
int merge_rename_limit;
|
||||
|
|
Загрузка…
Ссылка в новой задаче