On Sat, 2020-10-17 at 07:25 -0700, [email protected] wrote:
> From: Tom Rix <[email protected]>
>
> Remove the trailing error message from the fixed lines
>
> Signed-off-by: Tom Rix <[email protected]>
> ---
> v2: fix whitespace
Thanks Tom. Andrew can you pick this up please?
> ---
> scripts/checkpatch.pl | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index fab38b493cef..f9e78a5385ad 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -3393,8 +3393,11 @@ sub process {
>
> # check for adding lines without a newline.
> if ($line =~ /^\+/ && defined $lines[$linenr] &&
> $lines[$linenr] =~ /^\\ No newline at end of file/) {
> - WARN("MISSING_EOF_NEWLINE",
> - "adding a line without newline at end of file\n" .
> $herecurr);
> + if (WARN("MISSING_EOF_NEWLINE",
> + "adding a line without newline at end of
> file\n" . $herecurr) &&
> + $fix) {
> + fix_delete_line($fixlinenr+1, "No newline at
> end of file");
> + }
> }
>
> # check we are in a valid source file C or perl if not then ignore this hunk
