@matheusbsbs / matheus-bagliano / commits / 6c8647da5c

merge-recursive: fix logic ordering issue

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 detection. I didn't come up with any testcases demonstrating any bugs with the old ordering, but I suspect there were some for both normal renames and for directory renames. Fix the ordering. Reviewed-By: Stefan Beller <sbeller@google.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Jan 5, 2018 at 12:20 UTC 6c8647da5c84bac9039135652ce5e4beb763e5be

1 file changed +1 -1

merge-recursive.c

+1 -1

@@ -1989,10 +1989,10 @@ int merge_trees(struct merge_options *o,

1989 get_files_dirs(o, merge);

1990

1991 entries = get_unmerged();

1992 - record_df_conflict_files(o, entries);

1992 re_head = get_renames(o, head, common, head, merge, entries);

1993 re_merge = get_renames(o, merge, common, head, merge, entries);

1994 clean = process_renames(o, re_head, re_merge);

1995 + record_df_conflict_files(o, entries);

1996 if (clean < 0)

1997 goto cleanup;

1998 for (i = entries->nr-1; 0 <= i; i--) {