pr-git-1174/newren/merge-ort-rename-delete-renormalization-bug-v2
tagged this
30 Dec 22:08
From: Elijah Newren <newren@gmail.com> Ever since commit a492d5331c ("merge-ort: ensure we consult df_conflict and path_conflicts", 2021-06-30), when renormalization is active AND a file is involved in a rename/delete conflict BUT the file is unmodified (either before or after renormalization), merge-ort was running into an assertion failure. Prior to that commit (or if assertions were compiled out), merge-ort would mis-merge instead, ignoring the rename/delete conflict and just deleting the file. Remove the assertions, fix the code appropriately, leave some good comments in the code, and add a testcase for this situation. Reported-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com> Submitted-As: https://lore.kernel.org/git/pull.1174.v2.git.git.1640902135926.gitgitgadget@gmail.com In-Reply-To: https://lore.kernel.org/git/pull.1174.git.git.1640650846612.gitgitgadget@gmail.com
Assets 2
-
2021-12-30T22:08:55Z -
2021-12-30T22:08:55Z -