Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)

From: Russell King - ARM Linux <linux@arm.linux.org.uk>
Date: Sep 4, 2010, 21:45 UTC
Message-ID: <20100904214527.GA20444@n2100.arm.linux.org.uk>
In-Reply-To: <201009042333.51419.agruen@suse.de>

On Sat, Sep 04, 2010 at 11:33:51PM +0200, Andreas Gruenbacher wrote:

Show 12 quoted lines

> On Saturday 04 September 2010 02:03:48 Russell King - ARM Linux wrote:
> > As I say, it's because GNU patch doesn't (currently) understand GIT
> > patches.  I wouldn't call that a bug in GNU patch.
> 
> GNU patch in the version used does understand GIT patch headers and does 
> support things like renames.
> 
> The --dry-run option often will not work when the same file is modified more 
> than once in the same patch, though.  This is because GNU patch doesn't 
> remember the intermediary states of files.
> 
> In this case, the patch itself is broken.

GIT has many options to control how it produces patches, and -C or -M allow it to reduce the size of patches making them more reviewable. It also makes them incompatible with GNU patch, whether or not GNU patch understands the GIT headers.

As I've already said - if you want GNU compatible patches, don't generate GIT patches using -C or -M.

Simples.