Re: Unexpected git merge exit code when killing merge driver during ancestor merge

From: Elijah Newren <newren@gmail.com>
Date: Jun 13, 2024, 20:50 UTC
Message-ID: <CABPp-BFrcNLA-714gw+JogtAQLhmcs_sLnkkaBiGERF+riwZLQ@mail.gmail.com>
In-Reply-To: <CABPp-BEogmpG7pYmC84WhQCy0tP97cV8BZ8epPeo4fzmRjU5Rg@mail.gmail.com>

On Wed, May 8, 2024 at 10:03 PM Elijah Newren <newren@gmail.com> wrote:

Show 7 quoted lines

>
> On Fri, Apr 5, 2024 at 1:04 PM brian m. carlson
> <sandals@crustytoothpaste.net> wrote:
> >
> > On 2024-04-04 at 16:16:05, Matt Cree wrote:
> > > Hello all. I have observed some strange behaviour when exiting a custom merge driver that I was wondering if there’s any reason for — I think it may be a bug but I’ll leave that to you to decide.
> > >

[...]

> > This is definitely a bug because we triggered an assertion.  The
> > assertion asserts that that case will never happen, so if it does, we've
> > made a mistake in our code.

[...]

Show 10 quoted lines

> > I've CC'd Elijah Newren, who's the author of merge-ort and who wrote the
> > code.  I'm not familiar at all with merge-ort, so I can't speak to what
> > might be going wrong here.
>
> brian: Thanks for tagging me and expounding on the testcase.
> Matt: sorry for taking so long to respond.
>
> This is just a quick note to say I'm aware of the bug and will respond
> (I think there might be a simple fix here), but for various reasons
> it's going to be a couple more weeks.

Again, sorry for the delay. For those reading through the archives, I posted a fix to this and a few other issues found while investigating this problem over here: https://lore.kernel.org/git/pull.1748.git.1718310307.gitgitgadget@gmail.com/