From: Taylor Blau <me@ttaylorr.com>
To: Elijah Newren <newren@gmail.com>
Cc: Taylor Blau <me@ttaylorr.com>, Git Mailing List <git@vger.kernel.org>
Subject: Re: merge-ort assertion failure
Date: Fri, 14 Jan 2022 17:29:13 -0500 [thread overview]
Message-ID: <YeH5OSG0RW29REhn@nand.local> (raw)
In-Reply-To: <CABPp-BFM+fU+jVJwrU4ooPGvHbw859M+RNb+MvJe12MPV_=q7g@mail.gmail.com>
On Fri, Jan 14, 2022 at 02:15:31PM -0800, Elijah Newren wrote:
> On Fri, Jan 14, 2022 at 11:46 AM Taylor Blau <me@ttaylorr.com> wrote:
>
> > I haven't had a chance to look into it very deeply yet. Elijah: I figure
> > that this is the sort of thing that may be totally obvious to you, so
> > I'm sharing it here in case it is.
>
> I don't have a testcase (though I think there is probably enough
> information here for me to create one), but I think I know the
> problem. Does this fix it for you? :
> https://github.com/git/git/pull/1193
Unfortunately not. With a sufficiently small value of merge.renameLimit
(in my case, just 1) I can trigger the same assertion failure:
$ GIT_DEBUGGER=1 git.compile -c merge.renameLimit=1 rebase $onto
[...]
Thread 1 "git" hit Breakpoint 1, clear_or_reinit_internal_opts (opti=0x55555b0cf3f0, reinitialize=0) at merge-ort.c:546
546 assert(renames->cached_pairs_valid_side == 0);
(gdb) p renames->cached_pairs_valid_side
$1 = -1
Short of providing a small, reproducible test-case, I'm happy to share
any information I can about the repository that might be useful to you.
Thanks,
Taylor
prev parent reply other threads:[~2022-01-14 22:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-14 19:46 merge-ort assertion failure Taylor Blau
2022-01-14 22:15 ` Elijah Newren
2022-01-14 22:29 ` Taylor Blau [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YeH5OSG0RW29REhn@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).