All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Whitcroft <apw@shadowen.org>
To: Jan Engelhardt <jengelh@computergmbh.de>
Cc: Adrian Bunk <bunk@kernel.org>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Joel Schopp <jschopp@austin.ibm.com>,
	Linux Kernel Development <linux-kernel@vger.kernel.org>,
	Matthew Wilcox <matthew@wil.cx>
Subject: Re: checkpatch: ERROR: Does not appear to be a unified-diff format patch
Date: Sat, 13 Oct 2007 15:47:14 +0100	[thread overview]
Message-ID: <20071013144714.GC31579@shadowen.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0710131453530.31913@fbirervta.pbzchgretzou.qr>

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

      parent reply	other threads:[~2007-10-13 14:59 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-13 12:28 checkpatch: ERROR: Does not appear to be a unified-diff format patch Geert Uytterhoeven
2007-10-13 12:47 ` Adrian Bunk
2007-10-13 12:55   ` Jan Engelhardt
2007-10-13 13:52     ` Adrian Bunk
2007-10-13 14:47     ` Andy Whitcroft [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071013144714.GC31579@shadowen.org \
    --to=apw@shadowen.org \
    --cc=bunk@kernel.org \
    --cc=geert@linux-m68k.org \
    --cc=jengelh@computergmbh.de \
    --cc=jschopp@austin.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matthew@wil.cx \
    --cc=rdunlap@xenotime.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.