git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefano Rivera <stefano@rivera.za.net>
To: git@vger.kernel.org
Subject: git rebase crash: merge-ort.c:2622: apply_directory_rename_modifications: Assertion `ci->dirmask == 0' failed.
Date: Fri, 16 Sep 2022 14:42:34 +0200	[thread overview]
Message-ID: <20220916124234.h57p67mwywzok23s@haydn.kardiogramm.net> (raw)

[-- Attachment #1: Type: text/plain, Size: 874 bytes --]

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

[System Info]
git version:
git version 2.38.0.rc0.373.g21cbab7515
cpu: x86_64
built from commit: 21cbab75150d71ca294e09180c59ee529ca53957
sizeof-long: 8
sizeof-size_t: 8
shell-path: /bin/sh
uname: Linux 5.18.0-3-amd64 #1 SMP PREEMPT_DYNAMIC Debian 5.18.14-1 (2022-07-23) x86_64
compiler info: gnuc: 12.2
libc info: glibc: 2.34
$SHELL (typically, interactive shell): /bin/bash

[Enabled Hooks]

[-- Attachment #2: reproduce.sh --]
[-- Type: application/x-sh, Size: 484 bytes --]

             reply	other threads:[~2022-09-16 12:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-16 12:42 Stefano Rivera [this message]
2022-09-20  7:15 ` git rebase crash: merge-ort.c:2622: apply_directory_rename_modifications: Assertion `ci->dirmask == 0' failed Elijah Newren
2022-10-22 19:06   ` Elijah Newren

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=20220916124234.h57p67mwywzok23s@haydn.kardiogramm.net \
    --to=stefano@rivera.za.net \
    --cc=git@vger.kernel.org \
    /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).