On Fri, Sep 03, 2010 at 01:43:51PM -0500, Jonathan Nieder wrote:

(+cc: bug-patch)

Hi,

Uwe Kleine-K?nig wrote:

quoted

On Fri, Sep 03, 2010 at 07:18:43PM +0900, Magnus Damm wrote:

quoted

quoted

Using --dry-run is fine, but omitting dry-run gives me:

...
patching file arch/arm/common/clkdev.c
patching file arch/sh/include/asm/clkdev.h
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 11.
2 out of 2 hunks FAILED -- saving rejects to file
arch/sh/include/asm/clkdev.h.rej

I guess this is caused by the last "renaming" hunk, see below.

Yep, I can reproduce this.  Patch applies with "git apply",
"patch --dry-run -p1" accepts it, "patch -p1" fails.

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.