git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Date
Sep 3, 2010, 19:33 UTC
Message-ID
<20100903193309.GC29821@pengutronix.de>
In-Reply-To
<20100903192907.GA2978@n2100.arm.linux.org.uk>
Hey Russell,
On Fri, Sep 03, 2010 at 08:29:07PM +0100, Russell King - ARM Linux wrote:
Show 24 quoted lines
> On Fri, Sep 03, 2010 at 01:43:51PM -0500, Jonathan Nieder wrote:
> > 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.
Still GNU patch should then already fail in --dry-run mode.
 
Best regards
Uwe
-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Previous: Russell King - ARM LinuxNext: Andreas Schwab
Message 4 of 16 in “Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c”
  1. Uwe Kleine-KönigSep 3, 2010
  2. [BUG?] rename patch accepted with --dry-run, rejected without (Re: [PATCH V3] arm & sh: factorised duplicated clkdev.c)Jonathan Nieder, Sep 3, 2010
  3. Russell King - ARM LinuxSep 3, 2010
  4. Uwe Kleine-KönigSep 3, 2010
  5. Andreas SchwabSep 3, 2010
  6. Russell King - ARM LinuxSep 4, 2010
  7. Andreas GruenbacherSep 4, 2010
  8. Russell King - ARM LinuxSep 4, 2010
  9. Andreas GruenbacherSep 4, 2010
  10. Russell King - ARM LinuxSep 4, 2010
  11. Andreas GruenbacherSep 4, 2010
  12. Matthieu MoySep 3, 2010
  13. Andreas GruenbacherSep 3, 2010
  14. Jonathan NiederSep 3, 2010
  15. Andreas GruenbacherSep 4, 2010
  16. Jean-Christophe PLAGNIOL-VILLARDSep 4, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.