[PATCH v2] devtools: check that maintainers are listed in mailmap

David Marchand david.marchand at redhat.com
Fri Jun 28 14:56:12 CEST 2024 

When a maintainer changes its mail address, check that the associated
entry in .mailmap knows this address, otherwise there is a chance
.mailmap points at an obsolete address.

While at it, fix Zhirun mail address in mailmap and add Jian and Srikanth.

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
Changes since v1:
- merged patch 1,
- added Jian and Srikanth to .mailmap,

---
 .mailmap                      |  4 +++-
 devtools/check-maintainers.sh | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index f76037213d..31383bc782 100644
--- a/.mailmap
+++ b/.mailmap
@@ -645,6 +645,7 @@ Jesper Wramberg <jesper.wramberg at gmail.com>
 Jesse Brandeburg <jesse.brandeburg at intel.com>
 Jesse Bruni <jesse.bruni at intel.com>
 Jia He <justin.he at arm.com> <jia.he at hxt-semitech.com>
+Jian Wang <jianwang at trustnetic.com>
 Jianbo Liu <jianbo.liu at arm.com> <jianbo.liu at linaro.org>
 Jianfeng Tan <jianfeng.tan at intel.com>
 Jiang Yu <yux.jiang at intel.com>
@@ -1378,6 +1379,7 @@ Souvik Dey <sodey at rbbn.com> <sodey at sonusnet.com>
 Spike Du <spiked at nvidia.com>
 Sridhar Samudrala <sridhar.samudrala at intel.com>
 Sriharsha Basavapatna <sriharsha.basavapatna at broadcom.com>
+Srikanth Jampala <jsrikanth at marvell.com>
 Srikanth Yalavarthi <syalavarthi at marvell.com>
 Srinivas Narayan <srinivas.narayan at att.com>
 Srisivasubramanian Srinivasan <srinivasan at marvell.com> <ssrinivasan at caviumnetworks.com>
@@ -1711,7 +1713,7 @@ Zhihong Wang <wangzhihong.wzh at bytedance.com> <zhihong.wang at intel.com>
 Zhike Wang <wangzhike at jd.com> <wangzk320 at 163.com>
 Zhimin Huang <zhiminx.huang at intel.com>
 Zhipeng Lu <luzhipeng at cestc.cn>
-Zhirun Yan <zhirun.yan at intel.com>
+Zhirun Yan <yanzhirun_163 at 163.com> <zhirun.yan at intel.com>
 Zhiwei He <zhiwei.he at intel.com>
 Zhiyong Yang <zhiyong.yang at intel.com>
 Zhuobin Huang <zobin1999 at gmail.com>
diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh
index 71697bb352..8a786e14a9 100755
--- a/devtools/check-maintainers.sh
+++ b/devtools/check-maintainers.sh
@@ -85,6 +85,18 @@ check_fx () # <index file>
 	done
 }
 
+# Check that every maintainer mail is known of .mailmap:
+check_mailmap () # <index file> <mailmap file>
+{
+	sed -n -e 's/^M: \(.*<.*\)$/\1/p' $1 | sort -u | while read line; do
+		name=${line%% <*}
+		mail='<'${line##* <}
+		if ! grep -q "^$name <" $2 || ! grep -iq "^$name.*$mail" $2; then
+			echo $name mail address $mail is not in $2
+		fi
+	done
+}
+
 # Add a line to a set of lines if it begins with right pattern
 add_line_to_if () # <new line> <lines> <head pattern>
 {
@@ -129,4 +141,10 @@ echo '# wrong patterns'
 echo '##########'
 check_fx MAINTAINERS
 
+echo
+echo '##########'
+echo '# wrong mailmap'
+echo '##########'
+check_mailmap MAINTAINERS .mailmap
+
 # TODO: check overlaps
-- 
2.45.2

More information about the dev mailing list