en/merge-dual-dir-renames-fix (Was: Re: What's cooking in git.git (Jul 2022, #01; Fri, 1))

On Fri, Jul 1, 2022 at 4:23 PM Junio C Hamano [off-list ref] wrote:

* en/merge-dual-dir-renames-fix (2022-06-30) 5 commits
 - merge-ort: fix issue with dual rename and add/add conflict
 - merge-ort: shuffle the computation and cleanup of potential collisions
 - merge-ort: make a separate function for freeing struct collisions
 - merge-ort: small cleanups of check_for_directory_rename
 - t6423: add tests of dual directory rename plus add/add conflict

 Fixes a long-standing corner case bug around directory renames in
 the merge-ort strategy.

 Will merge to 'next'?
 source: [ref]

Ævar pointed out a for-initializer that shouldn't yet be used since
we've only used that in a "weather balloon" so far.  Let me send in a
re-roll to fix that one issue before you merge down.