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 /merge-ort.c | |
| parent | e9d7761bb94f20acc98824275e317fa82436c25d (diff) | |
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 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/merge-ort.c b/merge-ort.c index 0342f10483..c319797021 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -3841,9 +3841,22 @@ static void process_entry(struct merge_options *opt, if (opt->renormalize && blob_unchanged(opt, &ci->stages[0], &ci->stages[side], path)) { - ci->merged.is_null = 1; - ci->merged.clean = 1; - assert(!ci->df_conflict && !ci->path_conflict); + if (!ci->path_conflict) { + /* + * Blob unchanged after renormalization, so + * there's no modify/delete conflict after all; + * we can just remove the file. + */ + ci->merged.is_null = 1; + ci->merged.clean = 1; + /* + * file goes away => even if there was a + * directory/file conflict there isn't one now. + */ + ci->df_conflict = 0; + } else { + /* rename/delete, so conflict remains */ + } } else if (ci->path_conflict && oideq(&ci->stages[0].oid, &ci->stages[side].oid)) { /* |