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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, May 8, 2024 at 10:03 PM Elijah Newren <newren@xxxxxxxxx> wrote:
>
> On Fri, Apr 5, 2024 at 1:04 PM brian m. carlson
> <sandals@xxxxxxxxxxxxxxxxxxxx> 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.
[...]
> > 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@xxxxxxxxx/





[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux