Skip to contentSkip to conversation

mailmap: fix outdated entry for Zhirun

PATCH New David Marchand 1 participant 4 messages Mar 22, 2024 – Jul 9, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mailmap: fix outdated entry for Zhirun

Fixes aafd14f43eea ("maintainers: update for graph library")
---
 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
.mailmap +1 -1
index 50726e1232..83470af712 100644
@@ -1683,7 +1683,7 @@ Zhihong Wang <[email protected]> <[email protected]>
 Zhike Wang <[email protected]> <[email protected]>
 Zhimin Huang <[email protected]>
 Zhipeng Lu <[email protected]>
-Zhirun Yan <[email protected]>
+Zhirun Yan <[email protected]> <[email protected]>
 Zhiwei He <[email protected]>
 Zhiyong Yang <[email protected]>
 Zhuobin Huang <[email protected]>
Signature · 1 line
2.44.0
#1 lore raw

PATCH 2/2 devtools: check that maintainers are listed in mailmap

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.

---
 devtools/check-maintainers.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
devtools/check-maintainers.sh +18 -0
index 71697bb352..8a786e14a9 100755
@@ -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
Signature · 1 line
2.44.0
#2 lore raw

PATCH v2 1/1 devtools: check that maintainers are listed in mailmap

In reply to David Marchand

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.

---
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(-)
.mailmap +3 -1
index f76037213d..31383bc782 100644
@@ -645,6 +645,7 @@ Jesper Wramberg <[email protected]>
 Jesse Brandeburg <[email protected]>
 Jesse Bruni <[email protected]>
 Jia He <[email protected]> <[email protected]>
+Jian Wang <[email protected]>
 Jianbo Liu <[email protected]> <[email protected]>
 Jianfeng Tan <[email protected]>
 Jiang Yu <[email protected]>
@@ -1378,6 +1379,7 @@ Souvik Dey <[email protected]> <[email protected]>
 Spike Du <[email protected]>
 Sridhar Samudrala <[email protected]>
 Sriharsha Basavapatna <[email protected]>
+Srikanth Jampala <[email protected]>
 Srikanth Yalavarthi <[email protected]>
 Srinivas Narayan <[email protected]>
 Srisivasubramanian Srinivasan <[email protected]> <[email protected]>
@@ -1711,7 +1713,7 @@ Zhihong Wang <[email protected]> <[email protected]>
 Zhike Wang <[email protected]> <[email protected]>
 Zhimin Huang <[email protected]>
 Zhipeng Lu <[email protected]>
-Zhirun Yan <[email protected]>
+Zhirun Yan <[email protected]> <[email protected]>
 Zhiwei He <[email protected]>
 Zhiyong Yang <[email protected]>
 Zhuobin Huang <[email protected]>
devtools/check-maintainers.sh +18 -0
index 71697bb352..8a786e14a9 100755
@@ -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
Signature · 1 line
2.45.2
author Applied
#3 lore raw

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

Quoted 8 lines · David Marchand

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.

Applied.

Signature · 1 line
David Marchand