From: Jeff King <peff@peff.net>
To: Olaf Hering <olaf@aepfle.de>
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>, git@vger.kernel.org
Subject: Re: git format-patch --break-rewrites broken in 2.9.3
Date: Thu, 18 Aug 2016 11:15:45 -0400 [thread overview]
Message-ID: <20160818151544.7rhfe7cetl3hp3b5@sigill.intra.peff.net> (raw)
In-Reply-To: <20160818150522.56gdx2mhgo7qwvru@sigill.intra.peff.net>
On Thu, Aug 18, 2016 at 11:05:22AM -0400, Jeff King wrote:
> On Thu, Aug 18, 2016 at 04:44:21PM +0200, Olaf Hering wrote:
>
> > This command used to create a diff which can be consumed by patch. But
> > at least with 2.9.3 it just gives a rename output:
> >
> > git format-patch \
> > --no-signature \
> > --stdout \
> > --break-rewrites \
> > --keep-subject \
> > 95fa0405c5991726e06c08ffcd8ff872f7fb4f2d^..95fa0405c5991726e06c08ffcd8ff872f7fb4f2d
> >
> >
> > What must be done now to get a usable patch?
>
> Probably --no-renames.
>
> Renames were enabled by default by 5404c11 (diff: activate diff.renames
> by default, 2016-02-25), which is in v2.9.0.
>
> I wonder if we should consider undoing that for format-patch, whose
> output may be consumed by non-git endpoints.
By the way, this probably has nothing to do with --break-rewrites in
particular. It would come up for any case where git finds a rename. In
the absence of --break-rewrites, that requires a path being deleted and
one being added. But in this particular case, --break-rewrites turns a
large change into a delete/add pair, which lets git find the rename.
So it's a necessary option to show the problem in _this_ instance, but
there are other cases that would not need it.
-Peff
next prev parent reply other threads:[~2016-08-19 1:03 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 [this message]
[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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160818151544.7rhfe7cetl3hp3b5@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@imag.fr \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).