Code

merge-recursive: Move handling of double rename of one file to other file
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:01 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:04 +0000 (17:37 -0700)
commit161cf7f9490285700432f23a953f8e238f3469f5
treeea5a89c09bc2e0e04064ea909bdc74c083b52d4f
parent07413c5a3115df424bee1ebe627676df0734f787
merge-recursive: Move handling of double rename of one file to other file

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c