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

Re: git format-patch --break-rewrites broken in 2.9.3

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 18, 2016, 17:27 UTC
Message-ID
<xmqq7fbe6l7y.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<alpine.DEB.2.20.1608181713440.4924@virtualbox>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 12 quoted lines
> Hi Olaf,
>
>>         --break-rewrites \
>>         --keep-subject \
>>  95fa0405c5991726e06c08ffcd8ff872f7fb4f2d^..95fa0405c5991726e06c08ffcd8ff872f7fb4f2d
>> 
>> What must be done now to get a usable patch?
>
> Maybe --no-renames? BTW this behavior was not introduced in 2.9.3, but in
> 2.9.0:
>
> https://github.com/git/git/blob/v2.9.0/Documentation/RelNotes/2.9.0.txt#L7-L9
I think that is one half of the story.

The other half is a long/well known bug that lets "diff -B -M" to produce incorrect/broken patch that cannot be applied. It was documented in the thread that begins at:

    public-inbox.org/git/xmqqfvapuhkk.fsf@gitster.dls.corp.google.com
but still hasn't been solved.
Previous: Johannes SchindelinNext: Junio C Hamano
Message 3 of 11 in “git format-patch --break-rewrites broken in 2.9.3”
  1. Olaf HeringAug 18, 2016
  2. Johannes SchindelinAug 18, 2016
  3. Junio C HamanoAug 18, 2016
  4. Junio C HamanoAug 18, 2016
  5. Jeff KingAug 18, 2016
  6. Jeff KingAug 18, 2016
  7. Philip OakleyAug 19, 2016
  8. Andreas SchwabAug 19, 2016
  9. Jeff KingAug 18, 2016
  10. Olaf HeringAug 18, 2016
  11. Matthieu MoyAug 18, 2016

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.