From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBF71C35E04 for ; Tue, 25 Feb 2020 20:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA6A021927 for ; Tue, 25 Feb 2020 20:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731725AbgBYUQQ (ORCPT ); Tue, 25 Feb 2020 15:16:16 -0500 Received: from smtprelay0010.hostedemail.com ([216.40.44.10]:33420 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730794AbgBYUQQ (ORCPT ); Tue, 25 Feb 2020 15:16:16 -0500 Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay08.hostedemail.com (Postfix) with ESMTP id D9A14182CED2A; Tue, 25 Feb 2020 20:16:14 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-HE-Tag: lake01_706d7905ad62e X-Filterd-Recvd-Size: 3389 Received: from XPS-9350 (unknown [172.58.92.58]) (Authenticated sender: joe@perches.com) by omf03.hostedemail.com (Postfix) with ESMTPA; Tue, 25 Feb 2020 20:16:12 +0000 (UTC) Message-ID: <8b25478b524f5d9de8e080edf84b2daf1313cb00.camel@perches.com> Subject: Re: [RFC][PATCH] checkpatch: Properly warn if Change-Id comes after first Signed-off-by line From: Joe Perches To: John Stultz Cc: lkml , Andy Whitcroft , Andrew Morton Date: Tue, 25 Feb 2020 12:14:39 -0800 In-Reply-To: References: <20200224235824.126361-1-john.stultz@linaro.org> <187fa03a3690806748ca7cfd2b61728c0d33dcf0.camel@perches.com> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.34.1-2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 2020-02-25 at 09:45 -0800, John Stultz wrote: > On Mon, Feb 24, 2020 at 10:50 PM Joe Perches wrote: > > > Since I have a few kernel repos that I use for both upstream work and > > > work targeting AOSP trees, I usually have the gerrit commit hook > > > enabled in my tree (its easier to strip with sed then it is to re-add > > > after submitting to gerrit), and at least the commit-msg hook I have > > > will usually append a Change-Id: line at the end of the commit > > > message, usually after the signed-off-by line. I think this better still: --- scripts/checkpatch.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 3d55d8a2a..d0f850e 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2343,6 +2343,7 @@ sub process { my $is_binding_patch = -1; my $in_header_lines = $file ? 0 : 1; my $in_commit_log = 0; #Scanning lines before patch + my $has_patch_separator = 0; #Found a --- line my $has_commit_log = 0; #Encountered lines before patch my $commit_log_lines = 0; #Number of commit log lines my $commit_log_possible_stack_dump = 0; @@ -2668,6 +2669,12 @@ sub process { } } +# Check for patch separator + if ($line =~ /^---$/) { + $has_patch_separator = 1; + $in_commit_log = 0; + } + # Check if MAINTAINERS is being updated. If so, there's probably no need to # emit the "does MAINTAINERS need updating?" message on file add/move/delete if ($line =~ /^\s*MAINTAINERS\s*\|/) { @@ -2767,10 +2774,10 @@ sub process { "A patch subject line should describe the change not the tool that found it\n" . $herecurr); } -# Check for unwanted Gerrit info - if ($in_commit_log && $line =~ /^\s*change-id:/i) { +# Check for Gerrit Change-Ids not in any patch context + if ($realfile eq '' && !$has_patch_separator && $line =~ /^\s*change-id:/i) { ERROR("GERRIT_CHANGE_ID", - "Remove Gerrit Change-Id's before submitting upstream.\n" . $herecurr); + "Remove Gerrit Change-Id's before submitting upstream\n" . $herecurr); } # Check if the commit log is in a possible stack dump