[PATCH 28/37] merge-recursive: Move handling of double rename of one file to other file
- From
Elijah Newren <newren@gmail.com>
- Date
- Sep 20, 2010, 08:29 UTC
- Message-ID
- <1284971350-30590-29-git-send-email-newren@gmail.com>
- In-Reply-To
- <1284971350-30590-1-git-send-email-newren@gmail.com>
Move the handling of rename/rename conflicts where one file is renamed on both sides to the same file, from process_renames() to process_entry(). Here we avoid the three way merge logic by just using update_stages_and_entry() to move the higher stage entries in the index from the rename source to the rename destination, and then allow process_entry() to do its magic.
Signed-off-by: Elijah Newren <newren@gmail.com> --- merge-recursive.c | 32 ++++++-------------------------- 1 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index e219d62..21b52d4 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -971,33 +971,13 @@ static int process_renames(struct merge_options *o, remove_file(o, 0, ren1_dst, 0); /* ren2_dst not in head, so no need to delete */ } else { - struct merge_file_info mfi; remove_file(o, 1, ren1_src, 1); - mfi = merge_file(o, - ren1->pair->one, - ren1->pair->two, - ren2->pair->two, - branch1, - branch2); - if (mfi.merge || !mfi.clean) - output(o, 1, "Renaming %s->%s", src, ren1_dst); - - if (mfi.merge) - output(o, 2, "Auto-merging %s", ren1_dst); - - if (!mfi.clean) { - output(o, 1, "CONFLICT (content): merge conflict in %s", - ren1_dst); - clean_merge = 0; - - if (!o->call_depth) - update_stages(ren1_dst, - ren1->pair->one, - ren1->pair->two, - ren2->pair->two, - 1 /* clear */); - } - update_file(o, mfi.clean, mfi.sha, mfi.mode, ren1_dst); + update_stages_and_entry(ren1_dst, + ren1->dst_entry, + ren1->pair->one, + ren1->pair->two, + ren2->pair->two, + 1 /* clear */); } } else { /* Renamed in 1, maybe changed in 2 */
-- 1.7.3.271.g16009