From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH v2] devtools: relax tag checking in fixes Date: Wed, 18 Jan 2017 10:37:52 +0100 Message-ID: <1484732272-29137-1-git-send-email-thomas.monjalon@6wind.com> References: <1484664872-26859-1-git-send-email-thomas.monjalon@6wind.com> Cc: dev@dpdk.org To: Yuanhan Liu Return-path: Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 558A3F8AA for ; Wed, 18 Jan 2017 10:37:55 +0100 (CET) Received: by mail-wm0-f50.google.com with SMTP id c85so236576927wmi.1 for ; Wed, 18 Jan 2017 01:37:55 -0800 (PST) In-Reply-To: <1484664872-26859-1-git-send-email-thomas.monjalon@6wind.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The tag "Cc: stable@dpdk.org" must be set when the commit must be backported to a stable branch. The reminder is reworded. It should be located just below the "Fixes:" tag (without blank line) and followed by a blank line, separated from SoB and review tags below. However, there is no strong need for checking blank lines. Signed-off-by: Thomas Monjalon --- v2: relax checking and reword reminder v1: strict checking of blank lines while allowing Cc: stable --- devtools/check-git-log.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh index f6a35d2..62b5f43 100755 --- a/devtools/check-git-log.sh +++ b/devtools/check-git-log.sh @@ -170,12 +170,6 @@ bad=$(echo "$tags" | sed 's,^.,\t&,') [ -z "$bad" ] || printf "Wrong tag:\n$bad\n" -# check blank line after last Fixes: tag -bad=$(echo "$bodylines" | - sed -n 'N;/\nFixes:/D;/\n$/D;/^Fixes:/P' | - sed 's,^.,\t&,') -[ -z "$bad" ] || printf "Missing blank line after 'Fixes' tag:\n$bad\n" - # check missing Fixes: tag bad=$(for fix in $fixes ; do git log --format='%b' -1 $fix | grep -q '^Fixes: ' || @@ -198,9 +192,9 @@ bad=$(for fixtag in $fixtags ; do done | sed 's,^,\t,') [ -z "$bad" ] || printf "Wrong 'Fixes' reference:\n$bad\n" -# check CC:stable for fixes +# check Cc: stable@dpdk.org for fixes bad=$(for fix in $stablefixes ; do - git log --format='%b' -1 $fix | grep -qi '^CC: *stable@dpdk.org' || + git log --format='%b' -1 $fix | grep -qi '^Cc: *stable@dpdk.org' || git log --format='\t%s' -1 $fix done) -[ -z "$bad" ] || printf "Should CC: stable@dpdk.org\n$bad\n" +[ -z "$bad" ] || printf "Is it candidate for Cc: stable@dpdk.org backport?\n$bad\n" -- 2.7.0