From: Thomas Monjalon <thomas.monjalon@6wind.com>
To: dev@dpdk.org
Cc: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Subject: [dpdk-dev] [PATCH] devtools: check stable tag in fixes
Date: Tue, 17 Jan 2017 15:54:32 +0100 [thread overview]
Message-ID: <1484664872-26859-1-git-send-email-thomas.monjalon@6wind.com> (raw)
The tag "Cc: stable@dpdk.org" must be set when the commit must be
backported to a stable branch.
It must be located just below the "Fixes:" tag (without blank line)
and followed by a blank line, separated from SoB and review tags below.
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---
devtools/check-git-log.sh | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index f6a35d2..9f1b435 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -170,9 +170,9 @@ bad=$(echo "$tags" |
sed 's,^.,\t&,')
[ -z "$bad" ] || printf "Wrong tag:\n$bad\n"
-# check blank line after last Fixes: tag
+# check blank line (or Cc: stable) after last Fixes: tag
bad=$(echo "$bodylines" |
- sed -n 'N;/\nFixes:/D;/\n$/D;/^Fixes:/P' |
+ sed -n 'N;/\nFixes:/D;/\nC[Cc]: stable@/D;/\n$/D;/^Fixes:/P' |
sed 's,^.,\t&,')
[ -z "$bad" ] || printf "Missing blank line after 'Fixes' tag:\n$bad\n"
@@ -198,9 +198,15 @@ 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 "Should Cc: stable@dpdk.org\n$bad\n"
+
+# check blank line after Cc: stable@dpdk.org
+bad=$(echo "$bodylines" |
+ sed -n 'N;/\n$/D;/^C[Cc]: stable@dpdk.org/P' |
+ sed 's,^.,\t&,')
+[ -z "$bad" ] || printf "Missing blank line after 'Cc: stable@':\n$bad\n"
--
2.7.0
next reply other threads:[~2017-01-17 14:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 14:54 Thomas Monjalon [this message]
2017-01-17 18:15 ` Ferruh Yigit
2017-01-17 18:42 ` Thomas Monjalon
2017-01-18 4:41 ` Yuanhan Liu
2017-01-18 8:32 ` Thomas Monjalon
2017-01-18 8:54 ` Yuanhan Liu
2017-01-18 17:25 ` Ferruh Yigit
2017-01-19 8:05 ` Yuanhan Liu
2017-01-19 12:00 ` Ferruh Yigit
2017-01-20 7:59 ` Yuanhan Liu
2017-01-20 10:10 ` Thomas Monjalon
2017-01-20 10:23 ` Yuanhan Liu
2017-01-20 16:20 ` Ferruh Yigit
2017-01-18 9:37 ` [dpdk-dev] [PATCH v2] devtools: relax tag checking " Thomas Monjalon
2017-01-18 10:04 ` Yuanhan Liu
2017-01-18 15:52 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484664872-26859-1-git-send-email-thomas.monjalon@6wind.com \
--to=thomas.monjalon@6wind.com \
--cc=dev@dpdk.org \
--cc=yuanhan.liu@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).