Re: checkpatch: ERROR: Does not appear to be a unified-diff format patch

[Andy Whitcroft <apw@shadowen.org>]

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.
> /([-+]\d+)\b/ seems to imply /$1,1/

Yep, that occurs a lot in the second parameter which we expect this and
cope with it.  Will fix this for the next release.

Thanks for the analysis.

-apw
-
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/