From: Elijah Newren <newren@gmail.com>
To: Stefano Rivera <stefano@rivera.za.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git rebase crash: merge-ort.c:2622: apply_directory_rename_modifications: Assertion `ci->dirmask == 0' failed.
Date: Sat, 22 Oct 2022 12:06:13 -0700 [thread overview]
Message-ID: <CABPp-BFEg861ru2mJujnHLCD29WNgp4C6f8+CvL6vFRS6r5NLQ@mail.gmail.com> (raw)
In-Reply-To: <CABPp-BGdGZ6dg4_wWxkz+VCvaThfn3eL9uqBvmsK3+8GQf0ByA@mail.gmail.com>
Hi,
On Tue, Sep 20, 2022 at 12:15 AM Elijah Newren <newren@gmail.com> wrote:
>
> Hi,
>
> On Fri, Sep 16, 2022 at 6:24 AM Stefano Rivera <stefano@rivera.za.net> wrote:
> >
> > Hi, I got a crash in git-rebase, a failed assertion in merge-ort.c
> >
> > $ git rebase renamed-parent
> > git: merge-ort.c:2622: apply_directory_rename_modifications: Assertion `ci->dirmask == 0' failed.
> >
> > I was rebasing a branch that replaced a directory with a symlink, onto a
> > branch that renamed a parent directory of the modification.
> >
> > Reproducer script attached.
> >
> > Using --strategy=recursive avoids the crash, so it's a bug in ort.
> >
> > Not subscribed, please CC me in replies.
> >
> > Thanks,
> >
> > SR
> >
>
> Thanks for testing out a release candidate, typing up the detailed
> report, and even finding a simple testcase! Very cool.
>
> I don't have a fix, but just wanted to send a note out that I've seen
> your report and will take a look at it this week.
I had a hacky fix for about a month now, and haven't had time to clean
it up and look around for nearby issues.
I believe the cause here is related to the code added to fix the bug
in 902c521a35 ("t6423: more involved directory rename test",
2020-10-15). Since that issue was never fixed in merge-recursive, it
didn't get the side effect of this new bug. Had that other bug been
fixed in merge-recursive, it may well have exhibited a similar issue
with the testcase you reported here.
Anyway, I posted a patch to fix this issue in ort:
https://lore.kernel.org/git/pull.1391.git.1666465450590.gitgitgadget@gmail.com
Thanks again for reporting it, and for providing the simple steps to reproduce!
prev parent reply other threads:[~2022-10-22 19:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 12:42 git rebase crash: merge-ort.c:2622: apply_directory_rename_modifications: Assertion `ci->dirmask == 0' failed Stefano Rivera
2022-09-20 7:15 ` Elijah Newren
2022-10-22 19:06 ` Elijah Newren [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=CABPp-BFEg861ru2mJujnHLCD29WNgp4C6f8+CvL6vFRS6r5NLQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=stefano@rivera.za.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.
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).