From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Olaf Hering <olaf@aepfle.de>, git@vger.kernel.org
Subject: Re: git format-patch --break-rewrites broken in 2.9.3
Date: Thu, 18 Aug 2016 10:27:45 -0700 [thread overview]
Message-ID: <xmqq7fbe6l7y.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1608181713440.4924@virtualbox> (Johannes Schindelin's message of "Thu, 18 Aug 2016 17:15:08 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 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.
next prev parent reply other threads:[~2016-08-18 19:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-18 14:44 git format-patch --break-rewrites broken in 2.9.3 Olaf Hering
2016-08-18 15:05 ` Jeff King
2016-08-18 15:15 ` Jeff King
[not found] ` <vpqa8gayumw.fsf@anie.imag.fr>
2016-08-18 15:40 ` Jeff King
2016-08-18 15:48 ` Olaf Hering
2016-08-18 16:16 ` Matthieu Moy
2016-08-18 15:15 ` Johannes Schindelin
2016-08-18 17:27 ` Junio C Hamano [this message]
2016-08-18 20:42 ` Junio C Hamano
2016-08-19 18:04 ` Philip Oakley
2016-08-19 18:41 ` Andreas Schwab
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7fbe6l7y.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=olaf@aepfle.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.