Code

merge-recursive: Remove redundant path clearing for D/F conflicts
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:29:10 +0000 (02:29 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:37:05 +0000 (17:37 -0700)
commit4c0c1810c98e20ce05b2f026d6f9d62cfef7aefc
tree06870727fc2e18e243bafadb80b0f7fb5575887b
parentef02b317212443036be6007bba3a1a5946460dc9
merge-recursive: Remove redundant path clearing for D/F conflicts

The code had several places where individual checks were done to remove
files that could be in the way of directories in D/F conflicts.  Not all
D/F conflicts could have a path cleared for them in such a manner, however,
leading to the need to create make_room_for_directories_of_df_conflicts()
as done in the previous patch.  That new function could not have been
incorporated into the code sooner, since not all relevant code paths had
been deferred to process_df_entry() yet, leading to the creation of even
more of these now-redundant path removals.

Clean out all of these extra D/F path clearing cases.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c