From: Elijah Newren <newren@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>,
Matt Cree <matt.cree@gearset.com>,
git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: Unexpected git merge exit code when killing merge driver during ancestor merge
Date: Thu, 13 Jun 2024 13:50:04 -0700 [thread overview]
Message-ID: <CABPp-BFrcNLA-714gw+JogtAQLhmcs_sLnkkaBiGERF+riwZLQ@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BEogmpG7pYmC84WhQCy0tP97cV8BZ8epPeo4fzmRjU5Rg@mail.gmail.com>
On Wed, May 8, 2024 at 10:03 PM Elijah Newren <newren@gmail.com> wrote:
>
> 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.
[...]
> > 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/
next prev parent reply other threads:[~2024-06-13 20:50 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-04 16:16 Unexpected git merge exit code when killing merge driver during ancestor merge Matt Cree
2024-04-05 20:04 ` brian m. carlson
2024-05-09 5:03 ` Elijah Newren
2024-06-13 20:50 ` Elijah Newren [this message]
2024-06-13 22:22 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2024-05-08 18:14 Matt Cree
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CABPp-BFrcNLA-714gw+JogtAQLhmcs_sLnkkaBiGERF+riwZLQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=matt.cree@gearset.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).