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

Re: Re* [PATCH] builtin-rerere: fix conflict markers parsing

From
OMOlivier Marin <dkr+ml.git@free.fr>
Date
Jul 8, 2008, 10:42 UTC
Message-ID
<4873447D.5090208@free.fr>
In-Reply-To
<7vwsjwvmlk.fsf_-_@gitster.siamese.dyndns.org>
Junio C Hamano a écrit :
Show 11 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
> I am wondering if a patch like this on top of your patch may make things
> even safer.  The idea is the same as the earlier a1b32fd (git-rerere:
> detect unparsable conflicts, 2008-06-22) to fail rerere unless the markers
> are unambiguous.
> 
> Thanks to your isspace(buf[7]), it is slightly less likely that this
> safety triggers on false positives.
> 
> Thoughts?

My main concern was the error message that most users will not understand after a "git rebase --continue", for example. So, I tried to remove it and let things work as before because rerere seems to work even with ambiguous cases.

But I think your patch is the right thing to do: safe is better.
Olivier.
Previous: Junio C Hamano
Message 9 of 9 in “builtin-rerere: fix conflict markers parsing”
  1. builtin-rerere: fix conflict markers parsingOlivier Marin, Jul 7, 2008
  2. Johannes SchindelinJul 7, 2008
  3. Olivier MarinJul 7, 2008
  4. Johannes SchindelinJul 7, 2008
  5. Olivier MarinJul 7, 2008
  6. Johannes SchindelinJul 7, 2008
  7. Junio C HamanoJul 7, 2008
  8. Re* [PATCH] builtin-rerere: fix conflict markers parsingJunio C Hamano, Jul 8, 2008
  9. Olivier MarinJul 8, 2008

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.