Re: [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case

From: Elijah Newren <newren@gmail.com>
Date: Aug 6, 2019, 17:29 UTC
Message-ID: <CABPp-BEW4C__h+MVibmSNz3n3CaVDeDOxxYSfTgXj5NR_HfULw@mail.gmail.com>
In-Reply-To: <xmqqwofqjjdh.fsf@gitster-ct.c.googlers.com>

On Tue, Aug 6, 2019 at 10:26 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

>
> Elijah Newren <newren@gmail.com> writes:
>
> > I know this bug doesn't satisfy the normal criteria for making it into
> > 2.23 (it's a bug that was present in 2.22 rather than a regression in
> > 2.23), but given that it's a BUG() condition, I was hoping it is
> > important and safe enough to include anyway.
>
> For maintenance and upcoming release, a safer "fix" to do might be
> to also (in addition to this patch) flip the default to no to revert
> to the stable state before "directory renames" was introduced, while
> still allowing those who want to help can explore the right fix to
> this codepath.

That might be a bit more jarring. Directory rename detection did not have this bug in git 2.18, 2.19, 2.20, or 2.21. It was new to 2.22 with the 'conflict' setting