git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Marcel Röthke" <marcel@roethke.info>
To: Junio C Hamano <gitster@pobox.com>
Cc: Wolfgang Rohdewald <wolfgang@rohdewald.de>, git@vger.kernel.org
Subject: Re: segfault with git rebase --abort
Date: Sat, 6 Apr 2024 22:21:29 +0200	[thread overview]
Message-ID: <ZhGuyeJp28heaITM@roethke.info> (raw)
In-Reply-To: <xmqqfrwehweg.fsf@gitster.g>

On 2024-03-25 13:46:47, Junio C Hamano wrote:
> Wolfgang Rohdewald <wolfgang@rohdewald.de> writes:
> I think I forgot to remove one line of "<<<<<<< HEAD" before doing the first git add.

This was the missing piece in my reproduction attempts!
When you leave that line in and have another conflict in the same file
later in the rebase, rerere falls on its nose.

I will do some more poking and update my patch accordingly.


      reply	other threads:[~2024-04-06 20:28 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-24 18:28 segfault with git rebase --abort Wolfgang Rohdewald
2024-03-24 21:54 ` Junio C Hamano
2024-03-24 22:56   ` Wolfgang Rohdewald
2024-03-25 20:46     ` Junio C Hamano
2024-04-06 20:21       ` Marcel Röthke [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:
  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=ZhGuyeJp28heaITM@roethke.info \
    --to=marcel@roethke.info \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=wolfgang@rohdewald.de \
    /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).