Message-ID: <1505066895.22023.3.camel@perches.com>
Subject: Re: [PATCH] checkpatch: Fix ignoring cover-letter logic
From: Joe Perches <joe@perches.com>
To: Stafford Horne <shorne@gmail.com>,
        Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Whitcroft <apw@canonical.com>, linux-kernel@vger.kernel.org
Date: Sun, 10 Sep 2017 11:08:15 -0700
In-Reply-To: <20170909090406.31523-1-shorne@gmail.com>
References: <20170909090406.31523-1-shorne@gmail.com>
Content-Type: text/plain; charset="ISO-8859-1"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 981
Lines: 29

On Sat, 2017-09-09 at 18:04 +0900, Stafford Horne wrote:
> Currently running checkpatch on a directory with a cover-letter.patch
> file reports the following error:
> 
>   -----------------------------------------
>   patches/smp-v2/v2-0000-cover-letter.patch
>   -----------------------------------------
> 
>   ERROR: Does not appear to be a unified-diff format patch
> 
> The logic to suppress the unified-diff check for cover letters is there
> but is checking $file instead of $filename.  Fix the variable to use the
> correct one.
> 
> Signed-off-by: Stafford Horne <shorne@gmail.com>

Acked-by: Joe Perches <joe@perches.com>

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -6365,7 +6365,7 @@ sub process {
>  		exit(0);
>  	}
>  
> -	if (!$is_patch && $file !~ /cover-letter\.patch$/) {
> +	if (!$is_patch && $filename !~ /cover-letter\.patch$/) {
>  		ERROR("NOT_UNIFIED_DIFF",
>  		      "Does not appear to be a unified-diff format patch\n");
>  	}