| Message ID | 20200917170212.92672-1-sgarzare@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | checkpatch: avoid error on cover letter files | expand |
On 9/17/20 7:02 PM, Stefano Garzarella wrote: > Running checkpatch on a directory that contains a cover letter reports > this error: > > Checking /tmp/tmpbnngauy3/0000-cover-letter.patch... > ERROR: Does not appear to be a unified-diff format patch > > total: 1 errors, 0 warnings, 0 lines checked > > Let's skip cover letter as it is already done in the Linux kernel. .. "commits 06330fc40e3f ("checkpatch: avoid NOT_UNIFIED_DIFF errors on cover-letter.patch files") and a08ffbef4ab7 ("checkpatch: fix ignoring cover-letter logic")." Maybe complete with that ^^^ ? Regardless: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> > --- > scripts/checkpatch.pl | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl > index bd3faa154c..3c898f878a 100755 > --- a/scripts/checkpatch.pl > +++ b/scripts/checkpatch.pl > @@ -3005,7 +3005,7 @@ sub process { > return 1; > } > > - if (!$is_patch) { > + if (!$is_patch && $filename !~ /cover-letter\.patch$/) { > ERROR("Does not appear to be a unified-diff format patch\n"); > } > >
On Thu, Sep 17, 2020 at 07:44:21PM +0200, Philippe Mathieu-Daudé wrote: > On 9/17/20 7:02 PM, Stefano Garzarella wrote: > > Running checkpatch on a directory that contains a cover letter reports > > this error: > > > > Checking /tmp/tmpbnngauy3/0000-cover-letter.patch... > > ERROR: Does not appear to be a unified-diff format patch > > > > total: 1 errors, 0 warnings, 0 lines checked > > > > Let's skip cover letter as it is already done in the Linux kernel. > > .. "commits 06330fc40e3f ("checkpatch: avoid NOT_UNIFIED_DIFF errors > on cover-letter.patch files") and a08ffbef4ab7 ("checkpatch: fix > ignoring cover-letter logic")." > > Maybe complete with that ^^^ ? Yes, it's better ;-) Should I send a v2 or can be updated when queueing? > > Regardless: > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Thanks! Stefano
On 18/09/20 09:05, Stefano Garzarella wrote: > On Thu, Sep 17, 2020 at 07:44:21PM +0200, Philippe Mathieu-Daudé wrote: >> On 9/17/20 7:02 PM, Stefano Garzarella wrote: >>> Running checkpatch on a directory that contains a cover letter reports >>> this error: >>> >>> Checking /tmp/tmpbnngauy3/0000-cover-letter.patch... >>> ERROR: Does not appear to be a unified-diff format patch >>> >>> total: 1 errors, 0 warnings, 0 lines checked >>> >>> Let's skip cover letter as it is already done in the Linux kernel. >> >> .. "commits 06330fc40e3f ("checkpatch: avoid NOT_UNIFIED_DIFF errors >> on cover-letter.patch files") and a08ffbef4ab7 ("checkpatch: fix >> ignoring cover-letter logic")." >> >> Maybe complete with that ^^^ ? > > Yes, it's better ;-) > > Should I send a v2 or can be updated when queueing? > >> >> Regardless: >> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > Thanks! > > Stefano > Queued with the fixed message, thanks. Paolo
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index bd3faa154c..3c898f878a 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -3005,7 +3005,7 @@ sub process { return 1; } - if (!$is_patch) { + if (!$is_patch && $filename !~ /cover-letter\.patch$/) { ERROR("Does not appear to be a unified-diff format patch\n"); }
Running checkpatch on a directory that contains a cover letter reports this error: Checking /tmp/tmpbnngauy3/0000-cover-letter.patch... ERROR: Does not appear to be a unified-diff format patch total: 1 errors, 0 warnings, 0 lines checked Let's skip cover letter as it is already done in the Linux kernel. Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- scripts/checkpatch.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)