Re: [PATCH v2] .mailmap: Update mailmap entry for Fangyi Zhou and Peter Kaestle
From: Ævar Arnfjörð Bjarmason <hidden>
Date: 2021-09-20 11:21:47
On Mon, Sep 20 2021, Fangyi Zhou wrote:
quoted hunk ↗ jump to hunk
Acked-by: Peter Kaestle <peter@piie.net> Signed-off-by: Fangyi Zhou <redacted> --- .mailmap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/.mailmap b/.mailmap index 9c6a446bdf..854f397796 100644 --- a/.mailmap +++ b/.mailmap@@ -70,7 +70,8 @@ Eric S. Raymond <esr@thyrsus.com> Eric Wong <e@80x24.org> <normalperson@yhbt.net> Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com> Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no> -Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi +Fangyi Zhou <me@fangyi.io> <fangyi.zhou@yuriko.moe> +Fangyi Zhou <me@fangyi.io> Zhou Fangyi <fangyi.zhou@yuriko.moe> Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com> Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com> Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>@@ -209,6 +210,7 @@ Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)> Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)> Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de> Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de> +Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com> Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se> Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se> Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
I'm sure the maintainer would appreciate you and Martin Ågren
[off-list ref] (CC'd) coordinating, i.e. there's also this
outstanding change that overlaps with yours:
https://lore.kernel.org/git/20200816153037.1143576-1-martin.agren@gmail.com/ (local)
I.e. can everyone who wants to update the mailmap consolidate their
discussion/changes into one thread and come up with some recipe that
works for all of them?
FWIW I validated the change you made, while you could do your hunk more
minimally as:
-Fangyi Zhou [off-list ref] Zhou Fangyi
+Fangyi Zhou [off-list ref]
+[off-list ref] [off-list ref]
I understand per recent mailmap discussion that Junio prefers having the
entries sorted over eliminating redundancy.