From: Russell King - ARM Linux <linux@arm.linux.org.uk>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
linux-sh@vger.kernel.org, bug-patch@gnu.org,
Magnus Damm <magnus.damm@gmail.com>,
linux-arm-kernel@lists.infradead.org,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
git@vger.kernel.org
Subject: Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)
Date: Sat, 4 Sep 2010 01:03:48 +0100 [thread overview]
Message-ID: <20100904000348.GA7498@n2100.arm.linux.org.uk> (raw)
In-Reply-To: <20100903193309.GC29821@pengutronix.de>
On Fri, Sep 03, 2010 at 09:33:09PM +0200, Uwe Kleine-König wrote:
> > git patches include additional metadata for renaming files, which gnu patch
> > will not understand.
> >
> > If you want GNU patch compatible diffs, don't use -C or -M when generating
> > patches out of git.
> Still GNU patch should then already fail in --dry-run mode.
And now look at the patch - it touches arch/sh/include/asm/clkdev.h twice.
Once to remove it and once as a rename.
GNU patch not in --dry-run mode will first remove arch/sh/include/asm/clkdev.h,
and then not have a file to deal with when it tries to patch the rename
part. Whereas with --dry-run, the file stays around.
As I say, it's because GNU patch doesn't (currently) understand GIT
patches. I wouldn't call that a bug in GNU patch.
next prev parent reply other threads:[~2010-09-04 0:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1283431716-21540-1-git-send-email-plagnioj@jcrosoft.com>
[not found] ` <1283434786-26479-1-git-send-email-plagnioj@jcrosoft.com>
[not found] ` <AANLkTimRKCYYQmgwY0DHu5+e-ggT8grJbdjWFvUqTzH=@mail.gmail.com>
2010-09-03 18:23 ` [PATCH V3] arm & sh: factorised duplicated clkdev.c Uwe Kleine-König
2010-09-03 18:43 ` [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c) Jonathan Nieder
2010-09-03 19:29 ` Russell King - ARM Linux
2010-09-03 19:33 ` Uwe Kleine-König
2010-09-03 19:45 ` Andreas Schwab
2010-09-04 0:03 ` Russell King - ARM Linux [this message]
2010-09-04 21:33 ` [bug-patch] " Andreas Gruenbacher
2010-09-04 21:45 ` Russell King - ARM Linux
2010-09-04 21:46 ` Andreas Gruenbacher
2010-09-04 22:01 ` Russell King - ARM Linux
2010-09-04 22:26 ` Andreas Gruenbacher
2010-09-03 19:34 ` Matthieu Moy
2010-09-03 22:58 ` [bug-patch] " Andreas Gruenbacher
2010-09-03 23:32 ` Jonathan Nieder
2010-09-04 21:57 ` Andreas Gruenbacher
2010-09-04 3:21 ` Jean-Christophe PLAGNIOL-VILLARD
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=20100904000348.GA7498@n2100.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--cc=bug-patch@gnu.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
--cc=plagnioj@jcrosoft.com \
--cc=u.kleine-koenig@pengutronix.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 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 NNTP newsgroup(s).