git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: segfault with git rebase --abort

From
Marcel Röthke <marcel@roethke.info>
Date
Apr 6, 2024, 20:21 UTC
Message-ID
<ZhGuyeJp28heaITM@roethke.info>
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.
Previous: Junio C Hamano
Message 5 of 5 in “segfault with git rebase --abort”
  1. Wolfgang RohdewaldMar 24, 2024
  2. Junio C HamanoMar 24, 2024
  3. Wolfgang RohdewaldMar 24, 2024
  4. Junio C HamanoMar 25, 2024
  5. Marcel RöthkeApr 6, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.