pr-812/newren/ort-renames-v2
tagged this
14 Dec 16:21
This series builds on en/merge-ort-2 and adds basic rename detection to merge-ort. Changes since v1 (all due to feedback from Stolee's reviews): * embedded struct rename_info directly in struct merge_options_internal (no longer a pointer) * expanded use of new enum merge_side and its new MERGE_BASE, MERGE_SIDE1, MERGE_SIDE2 constants * removed unnecessary secondary sort in compare_pairs() * improved commit messages * document p->score reuse with better comment(s) * space around operators Elijah Newren (11): merge-ort: add basic data structures for handling renames merge-ort: add initial outline for basic rename detection merge-ort: implement detect_regular_renames() merge-ort: implement compare_pairs() and collect_renames() merge-ort: add basic outline for process_renames() merge-ort: add implementation of both sides renaming identically merge-ort: add implementation of both sides renaming differently merge-ort: add implementation of rename collisions merge-ort: add implementation of rename/delete conflicts merge-ort: add implementation of normal rename handling merge-ort: add implementation of type-changed rename handling merge-ort.c | 445 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 429 insertions(+), 16 deletions(-) base-commit: c5a6f65527aa3b6f5d7cf25437a88d8727ab0646 Submitted-As: https://lore.kernel.org/git/pull.812.v2.git.1607962900.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.812.git.1607542887.gitgitgadget@gmail.com
Assets 2
-
2020-12-14T16:21:40Z -
2020-12-14T16:21:40Z -