diff mbox

[dpdk-dev,v2] devtools: relax tag checking in fixes

Message ID 1484732272-29137-1-git-send-email-thomas.monjalon@6wind.com (mailing list archive)
State Accepted, archived
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation success Compilation OK

Commit Message

Thomas Monjalon Jan. 18, 2017, 9:37 a.m. UTC 
  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 <thomas.monjalon@6wind.com>
---
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(-)

Comments

Yuanhan Liu Jan. 18, 2017, 10:04 a.m. UTC | #1 
On Wed, Jan 18, 2017 at 10:37:52AM +0100, Thomas Monjalon wrote:
> 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 <thomas.monjalon@6wind.com>

Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>

Thanks!

	--yliu
Thomas Monjalon Jan. 18, 2017, 3:52 p.m. UTC | #2 
2017-01-18 18:04, Yuanhan Liu:
> On Wed, Jan 18, 2017 at 10:37:52AM +0100, Thomas Monjalon wrote:
> > 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 <thomas.monjalon@6wind.com>
> 
> Reviewed-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
> 
> Thanks!

Applied
diff mbox

Patch

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"