mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 15:16:09 +02:00
Code

merge-recursive: add ability to turn off directory rename detection 

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-08-29 00:06:12 -07:00 committed by Junio C Hamano
parent e7588c9652
commit 5fdddd9b75
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
merge-recursive.c
View File

@ -2843,12 +2843,19 @@ static int handle_renames(struct merge_options *o,
head_pairs = get_diffpairs(o, common, head);
merge_pairs = get_diffpairs(o, common, merge);
dir_re_head = get_directory_renames(head_pairs, head);
dir_re_merge = get_directory_renames(merge_pairs, merge);
if (o->detect_directory_renames) {
dir_re_head = get_directory_renames(head_pairs, head);
dir_re_merge = get_directory_renames(merge_pairs, merge);
handle_directory_level_conflicts(o,
dir_re_head, head,
dir_re_merge, merge);
handle_directory_level_conflicts(o,
dir_re_head, head,
dir_re_merge, merge);
} else {
dir_re_head = xmalloc(sizeof(*dir_re_head));
dir_re_merge = xmalloc(sizeof(*dir_re_merge));
dir_rename_init(dir_re_head);
dir_rename_init(dir_re_merge);
}
ri->head_renames = get_renames(o, head_pairs,
dir_re_merge, dir_re_head, head,
@ -3541,6 +3548,7 @@ void init_merge_options(struct merge_options *o)
o->renormalize = 0;
o->diff_detect_rename = -1;
o->merge_detect_rename = -1;
o->detect_directory_renames = 1;
merge_recursive_config(o);
merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
if (merge_verbosity)

1
merge-recursive.h
View File

@ -18,6 +18,7 @@ struct merge_options {
unsigned renormalize : 1;
long xdl_opts;
int verbosity;
int detect_directory_renames;
int diff_detect_rename;
int merge_detect_rename;
int diff_rename_limit;