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:
reproduce.sh
Description: Bourne shell script
