diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-08-09 00:26:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-09 00:26:10 +0300 |
| commit | 0bdaec1d3db90d69041531311fb34fa09639589b (patch) | |
| tree | 6820529b8aecd2a0285cded426791b4f47335de9 /merge-recursive.c | |
| parent | c0a6c6614dcb660a31ac8b716a89a8911b1ab6d6 (diff) | |
| parent | ff6d54771af2c92867f773a264200f22b4cb2ab9 (diff) | |
Merge branch 'en/disable-dir-rename-in-recursive-merge'
"merge-recursive" hit a BUG() when building a virtual merge base
detected a directory rename.
* en/disable-dir-rename-in-recursive-merge:
merge-recursive: avoid directory rename detection in recursive case
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 12300131fc..6b812d67e3 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2863,7 +2863,8 @@ static int detect_and_process_renames(struct merge_options *opt, head_pairs = get_diffpairs(opt, common, head); merge_pairs = get_diffpairs(opt, common, merge); - if (opt->detect_directory_renames) { + if ((opt->detect_directory_renames == 2) || + (opt->detect_directory_renames == 1 && !opt->call_depth)) { dir_re_head = get_directory_renames(head_pairs); dir_re_merge = get_directory_renames(merge_pairs); |