Messages in this thread | | | Date | Sat, 13 Oct 2007 15:52:29 +0200 | From | Adrian Bunk <> | Subject | Re: checkpatch: ERROR: Does not appear to be a unified-diff format patch |
| |
On Sat, Oct 13, 2007 at 02:55:01PM +0200, Jan Engelhardt wrote: > > On Oct 13 2007 14:47, Adrian Bunk wrote: > >On Sat, Oct 13, 2007 at 02:28:00PM +0200, Geert Uytterhoeven wrote: > >> scripts/checkpatch.pl doesn't seem to like this patch: > >> > >> $ scripts/checkpatch.pl m68k-export-asm-cachectl-h.diff > >> ERROR: Does not appear to be a unified-diff format patch > >>... > >> --- a/include/asm-m68k/Kbuild > >> +++ b/include/asm-m68k/Kbuild > >> @@ -1 +1,2 @@ > >>... ^^ > > > >Broken patch, this has to be "-1,1". > > No, this is actually how diff outputs it. >...
You seem to be right.
That's a really strange part of the unidiff format - you have to write ",0" or ",2", but you can omit a ",1".
cu Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out of the darkness. There had been need of rain for many days. "Only a promise," Lao Er said. Pearl S. Buck - Dragon Seed
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |