From: Felipe Contreras <felipe.contreras@gmail.com>
To: BENTZ Sylvain <sylvain.bentz@md6.fr>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: RE: Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault
Date: Thu, 22 Jul 2021 05:25:01 -0500 [thread overview]
Message-ID: <60f9477d9cd3a_3fba2082@natae.notmuch> (raw)
In-Reply-To: <bdb6c03f290c49bb96e6c0a3d9742a52@md6.fr>
BENTZ Sylvain wrote:
> I've stumbled on a segmentation fault while resolving merge conflicts.
> Basically, I missed to remove some conflict markers, tried to commit the
> (faulty) merge resolution, and Git mishandles that.
>
> The original issue happened applying a patch using 3-way merge. The minimal
> working example below creates a conflict with a simple `git merge` command.
A quick workaround:
git config --global rerere.enabled false
But yeah, there seems to be a bug in `git rerere`.
--
Felipe Contreras
next prev parent reply other threads:[~2021-07-22 10:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-22 9:28 Bug: Commit a merge resolution with non-closed conflict markers leads to errs, segfault BENTZ Sylvain
2021-07-22 10:25 ` Felipe Contreras [this message]
2021-07-22 12:53 ` BENTZ Sylvain
2021-07-22 14:17 ` Ævar Arnfjörð Bjarmason
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=60f9477d9cd3a_3fba2082@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=sylvain.bentz@md6.fr \
/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).