Re: [PATCH 2/3] merge-ort: allow rename detection to be disabled

From: Taylor Blau <me@ttaylorr.com>
Date: Mar 12, 2025, 21:50 UTC
Message-ID: <Z9IBql7M3UuVMotw@nand.local>
In-Reply-To: <CABPp-BFj08mpXGiSoZ3xZ4KamwTJ4k5wPLTCJh6hUtKSxWE52Q@mail.gmail.com>

On Wed, Mar 12, 2025 at 02:40:35PM -0700, Elijah Newren wrote:

Show 6 quoted lines

> > I don't know if a link exists; I suspect the request referred to here is
> > an email that Johannes Schindelin wrote to Elijah privately).
>
> It exists: https://lore.kernel.org/git/CABPp-BG-Nx6SCxxkGXn_Fwd2wseifMFND8eddvWxiZVZk0zRaA@mail.gmail.com/
>
> ...which wasn't Johannes' request.

Ah, thanks for the link!

Show 12 quoted lines

> > But I am almost certain that the behavior requested here is to disable
> > rename detection to match the behavior of GitHub's prior use of libgit2
> > to perform merges, where we also had rename detection disabled (for
> > reasons that are unclear to me, but Peff might know).
>
> No, if that were the sole reason, I'd say it probably only belongs in
> our internal fork.  Disabling of rename detection within GitHub was a
> temporary internal migration measure, not a desired end state -- at
> least that's the way Johannes portrayed it to me.  I know that
> "temporary" sometimes lasts longer than we want, but now that I've
> become internal to GitHub, one of the things I want to do is add some
> weight to that "temporary" modifier.

:-).

Thanks, Taylor