Re: merge-ort assertion failure

>
> Elijah,
>
> A colleague reported that they were able to hit an assertion failure in
> merge-ort when rebasing a topic of their back onto upstream.
>
> The scenario (which I have been able to reproduce on a private
> repository, but haven't had time to reduce further) is:
>
>     $ git --version
>     git version 2.34.1
>
>     $ git rebase origin/master
>     warning: skipped previously applied commit 9cda243afc2a
>     warning: skipped previously applied commit 882bb87a3a7c
>     hint: use --reapply-cherry-picks to include skipped commits
>     hint: Disable this message with "git config advice.skippedCherryPicks false"
>     [some "Auto-merging" messages ...]
>     CONFLICT (content): Merge conflict in
>     [some file]
>     warning: exhaustive rename detection was skipped due to too many files.
>     warning: you may want to set your merge.renamelimit variable to at least 165 and retry the command.
>     Assertion failed: (renames->cached_pairs_valid_side == 0), function
>     clear_or_reinit_internal_opts, file merge-ort.c, line 546.
>     Abort trap: 6
>
> Their merge.renameLimit is set pretty low at just "1", and this
> assertion goes away so long as `merge.renameLimit` is set sufficiently
> high.
>
> I haven't had a chance to look into it very deeply yet. Elijah: I figure
> that this is the sort of thing that may be totally obvious to you, so
> I'm sharing it here in case it is.