From 92fdc2327755f334ca2c9beb1fa51481c6b07062 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 17 Jan 2017 15:35:11 +0100 Subject: [PATCH] devtools: relax tag checking in fixes 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 Reviewed-by: Yuanhan Liu --- 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 f6a35d2f8d..62b5f4338b 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.20.1