patch 'devtools: fix mailmap check for parentheses' has been queued to stable release 22.11.3

Xueming Li xuemingl at nvidia.com
Thu Aug 10 01:58:33 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/11/23. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=fc4be70deda0f278f9513f84ec0c97a946398090

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From fc4be70deda0f278f9513f84ec0c97a946398090 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Mon, 26 Jun 2023 12:24:03 +0200
Subject: [PATCH] devtools: fix mailmap check for parentheses
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 6fd14c1b58e669b109d5ff68e401f4c1f201c39f ]

When checking names having parentheses, the grep matching was failing.
It is fixed by escaping the open parenthesis.

Also, the mailmap path was relative to the root directory.
The path is made absolute.

Fixes: e83d41f0694d ("mailmap: add list of contributors")
Fixes: 83812de4f2f3 ("devtools: move mailmap check after patch applied")

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
 devtools/check-git-log.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh
index af751e49ab..89544a2cc5 100755
--- a/devtools/check-git-log.sh
+++ b/devtools/check-git-log.sh
@@ -264,8 +264,10 @@ names=$(git log --format='From: %an <%ae>%n%b' --reverse $range |
 	sed -rn 's,.*: (.*<.*@.*>),\1,p' |
 	sort -u)
 bad=$(for contributor in $names ; do
+	contributor=${contributor//(/\\(}
 	! grep -qE "^$contributor($| <)" $selfdir/../.mailmap || continue
-	if grep -q "^${contributor%% <*} <" .mailmap ; then
+	name=${contributor%% <*}
+	if grep -q "^$name <" $selfdir/../.mailmap ; then
 		printf "\t$contributor is not the primary email address\n"
 	else
 		printf "\t$contributor is unknown in .mailmap\n"
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-08-09 21:51:19.585732800 +0800
+++ 0054-devtools-fix-mailmap-check-for-parentheses.patch	2023-08-09 21:51:18.194352000 +0800
@@ -1 +1 @@
-From 6fd14c1b58e669b109d5ff68e401f4c1f201c39f Mon Sep 17 00:00:00 2001
+From fc4be70deda0f278f9513f84ec0c97a946398090 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 6fd14c1b58e669b109d5ff68e401f4c1f201c39f ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org


More information about the stable mailing list