diff options
author | Elijah Newren <newren@gmail.com> | 2018-01-05 12:20:00 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-01-19 14:44:18 -0800 |
commit | 6c8647da5c84bac9039135652ce5e4beb763e5be (patch) | |
tree | 27e2a3d0e42968877bb4859d166fa8345e6cc6a6 /t | |
parent | Tighten and correct a few testcases for merging and cherry-picking (diff) | |
download | tgif-6c8647da5c84bac9039135652ce5e4beb763e5be.tar.xz |
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions