Re: [PATCH 1/6] t1092: use ORT merge strategy

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 21, 2021, 04:20 UTC
Message-ID: <xmqqwnofsa24.fsf@gitster.g>
In-Reply-To: <CABPp-BHLw-h0oQLNwT+DAXeHZZfJRaiyoM+kDuqx_aT80-zM3w@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 11 quoted lines

>> It seems that merge_recursive() and merge_ort_recursive() are
>> interface compatible and the latter can serve as a drop-in
>> replacement for the former?
>
> Yes, merge_ort_recursive() and merge_ort_nonrecursive() were meant as
> interface compatible drop-in replacements for merge_recursive() and
> merge_trees(), to make it easy to switch callers over.
>
> There is no such replacement for merge_recursive_generic(), though,
> and builtin/{am, merge-recursive, stash}.c will all need to be
> modified to work with merge-ort.

But merge_recursive_generic() eveantually calls into merge_recursive(); as long as you hook into the latter, you're covered, no?