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

Re: What's the recommendation for forgetting all rerere's records?

From
Sean Allred <allred.sean@gmail.com>
Date
Feb 10, 2024, 17:18 UTC
Message-ID
<m01q9k9qyh.fsf@epic96565.epic.com>
In-Reply-To
<m05y0au2od.fsf@epic96565.epic.com>
Sean Allred <allred.sean@gmail.com> writes:
Show 21 quoted lines
> I've driven myself a little nuts trying to reproduce it this morning,
> but in doing so I've come to an important discovery: this bug presents
> if `core.autocrlf=true` but does *not* present if `core.autocrlf=input`.
>
> For completeness and future reference, the following script reproduces
> the issue on Windows:
>
>     [clip]
>
> At the end of this script, the 'bad merge' is still the recorded
> resolution and no rerere record exists for the 'good merge'.
>
> Just in case there's another piece of config somehow relevant, here's a
> dump of the system that reproduced this:
>
>     [clip]
>
> It's worth noting at this point that while I believe I reproduced on
> macOS last week, that doesn't jive with the available evidence (and I
> can't reproduce it on macOS this morning, though I suspect that has more
> to do with native use of LF over CRLF than anything else).

Is there a good way to convert this to a proper bug report without losing the context?

-- Sean Allred

Previous: Sean Allred
Message 7 of 7 in “What's the recommendation for forgetting all rerere's records?”
  1. Sean AllredDec 6, 2023
  2. Junio C HamanoDec 8, 2023
  3. Sean AllredDec 15, 2023
  4. Junio C HamanoDec 15, 2023
  5. Sean AllredJan 3, 2024
  6. Sean AllredJan 3, 2024
  7. Sean AllredFeb 10, 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.