Re: [PATCH 2/3] merge-recursive: fix logic ordering issue
- Date: Fri, 5 Jan 2018 22:22:52 +0100 (STD)
- From: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
- Subject: Re: [PATCH 2/3] merge-recursive: fix logic ordering issue
On Fri, 5 Jan 2018, Elijah Newren wrote:
> merge_trees() did a variety of work, including:
> * Calling get_unmerged() to get unmerged entries
> * Calling record_df_conflict_files() with all unmerged entries to
> do some work to ensure we could handle D/F conflicts correctly
> * Calling get_renames() to check for renames.
> An easily overlooked issue is that get_renames() can create more
> unmerged entries and add them to the list, which have the possibility of
> being involved in D/F conflicts. So the call to
> record_df_conflict_files() should really be moved after all the rename
I cannot actually see how the *current* rename detection would result in
D/F conflicts, as it is really only about detecting the renames, the
conflicts should have happened earlier.
But I could imagine that your "detect directory renames" patch series
changes this behavior.
In any case, the reordering does not hurt.