mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Elijah Newren <>
To: Stefano Rivera <>
Cc: Git Mailing List <>
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: <> (raw)
In-Reply-To: <>


On Tue, Sep 20, 2022 at 12:15 AM Elijah Newren <> wrote:
> Hi,
> On Fri, Sep 16, 2022 at 6:24 AM Stefano Rivera <> 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:

Thanks again for reporting it, and for providing the simple steps to reproduce!

      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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \ \ \ \ \

* 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

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).