[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected wi
From: |
Russell King - ARM Linux |
Subject: |
[bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c) |
Date: |
Fri, 3 Sep 2010 20:29:07 +0100 |
User-agent: |
Mutt/1.5.19 (2009-01-05) |
On Fri, Sep 03, 2010 at 01:43:51PM -0500, Jonathan Nieder wrote:
> (+cc: bug-patch)
>
> Hi,
>
> Uwe Kleine-König wrote:
> > On Fri, Sep 03, 2010 at 07:18:43PM +0900, Magnus Damm wrote:
>
> >> 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.
- [bug-patch] [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Jonathan Nieder, 2010/09/03
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c),
Russell King - ARM Linux <=
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Uwe Kleine-König, 2010/09/03
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Schwab, 2010/09/03
- [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/03
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Russell King - ARM Linux, 2010/09/04
- Re: [bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/04
[bug-patch] Re: [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Matthieu Moy, 2010/09/03
Re: [bug-patch] [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c), Andreas Gruenbacher, 2010/09/03