From: Ralf Thielow <ralf.thielow@gmail.com>
To: git <git@vger.kernel.org>
Cc: newren@gmail.com
Subject: [BUG?] assertion failure when merging branches
Date: Mon, 27 Dec 2021 19:34:30 +0100 [thread overview]
Message-ID: <CAN0XMOK8iHZnbtYw7CPAQGJcmuVSDxQoFNFEwiaa41V89F1rzA@mail.gmail.com> (raw)
Hi,
At $WORK I tried to merge two branches and ran into an assertion
failure. I exported the two branches down to the merge base as
an anonymous repo, so that it can be reproduced.
In the branch I tried to merge into, files have been moved
and/or reformatted.
My Git version is 2.34.1.
wget https://gist.github.com/ralfth/5b624abb0a99e3e705a0984c4b2d253e/raw/7f7ef5b10711550b90342c50b53ce25c19075c97/repo.txt
mkdir tmp
cd tmp
git init
cat ../repo.txt | git fast-import
git checkout ref0/ref1
git config merge.renormalize true
git merge ref2/ref0/ref3
git: merge-ort.c:3846: process_entry: Assertion `!ci->df_conflict &&
!ci->path_conflict' failed.
Aborted (core dumped)
Ciao,
Ralf
next reply other threads:[~2021-12-27 18:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-27 18:34 Ralf Thielow [this message]
2021-12-27 22:15 ` [BUG?] assertion failure when merging branches Elijah Newren
2021-12-28 0:30 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAN0XMOK8iHZnbtYw7CPAQGJcmuVSDxQoFNFEwiaa41V89F1rzA@mail.gmail.com \
--to=ralf.thielow@gmail.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.
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 NNTP newsgroup(s).