merge-recursive: Consolidate process_entry() and process_df_entry()
commitedd2faf52eda344eca2c01bc0b1d9f7f2f002a42
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:07 +0000 (11 23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:37 +0000 (14 14:19 -0700)
tree0120b94e729c674c799198e9bbc431ae6130cc69
parent51931bf08e7de1f597d36bc2fd38b5310b6da7dd
merge-recursive: Consolidate process_entry() and process_df_entry()

The whole point of adding process_df_entry() was to ensure that files of
D/F conflicts were processed after paths under the corresponding
directory.  However, given that the entries are in sorted order, all we
need to do is iterate through them in reverse order to achieve the same
effect.  That lets us remove some duplicated code, and lets us keep
track of one less thing as we read the code ("do we need to make sure
this is processed before process_df_entry() or do we need to defer it
until then?").

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