On Mon, Dec 27, 2021 at 2:15 PM Elijah Newren [off-list ref] wrote:

On Mon, Dec 27, 2021 at 10:35 AM Ralf Thielow [off-list ref] wrote:

quoted

Hi,

At $WORK I tried to merge two branches and ran into an assertion
failure. I exported the two branches down to the merge base as
an anonymous repo, so that it can be reproduced.

In the branch I tried to merge into, files have been moved
and/or reformatted.

My Git version is 2.34.1.

wget https://gist.github.com/ralfth/5b624abb0a99e3e705a0984c4b2d253e/raw/7f7ef5b10711550b90342c50b53ce25c19075c97/repo.txt
mkdir tmp
cd tmp
git init
cat ../repo.txt | git fast-import
git checkout ref0/ref1
git config merge.renormalize true
git merge ref2/ref0/ref3

git: merge-ort.c:3846: process_entry: Assertion `!ci->df_conflict &&
!ci->path_conflict' failed.
Aborted (core dumped)

Yikes, sorry about this renormalization bug in merge-ort.

...

I'll submit a patch with a smaller testcase soon.

For those wanting to follow along; fix submitted over here:
https://lore.kernel.org/git/pull.1174.git.git.1640650846612.gitgitgadget@gmail.com/ (local)