diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-12-28 00:20:46 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-30 10:40:26 -0800 |
| commit | d30126c20d5899f128facbd33ecf27163efe1326 (patch) | |
| tree | 4aa9934f54b5c790ed7053645bd3f1efdce1200a /contrib/subtree | |
| parent | Git 2.34.1 (diff) | |
| download | tgif-d30126c20d5899f128facbd33ecf27163efe1326.tar.xz | |
merge-ort: fix bug with renormalization and rename/delete conflicts
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>
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/subtree')
0 files changed, 0 insertions, 0 deletions