[BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)
Russell King - ARM Linux
linux at arm.linux.org.uk
Fri Sep 3 20:03:48 EDT 2010
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.
More information about the linux-arm-kernel
mailing list