From 8075511fc416af0c5a3518ac53522061d7e8b18f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Cohen=20Arazi?= Date: Wed, 4 Jun 2025 09:40:47 -0300 Subject: [PATCH] Bug 40041: mailmap fixes and tidy This patch fixes a couple errors I found in mailmap. Canonical names are added to some emails. Not 100% they are required, but they make sense anyway (i.e. if someone from OpenFifth forgets to set their name, we want the log/release notes to display it correctly regardless). A good example for the need of a canonical mapping is "Sam " which we really want to display "Sam Lau" even if they missed to put the complete name. That's when a canonical mapping serves its purpose. To test: 1. Run: $ for i in colin.campbell@openfifth.co.uk chloe.zermatten@openfifth.co.uk martin.renvoize@openfifth.co.uk aude.charillon@openfifth.co.uk andrew.isherwood@ptfs-europe.com matt.blenkinsop@openfifth.co.uk matt.blenkinsip@ptfs-europe.com matt.blenkinsop@ptfs-europe.com andrew.auld@ptfs-europe.com pedro.amorim@ptfs-europe.com msaby mathsabypro@gmail.com marjorie.barry-vila@collecto.ca andrew.auld@openfifth.co.uk catrina@bywatersolutions.com felicie.thiery@biblibre.com janne.seppanen@lahti.fi jesse@bywatersolutions.com kelly@bywatersolutions.com laurence.rault@biblibre.com samalau@gmail.com ; do git check-mailmap -- $i ; done => FAIL: They don't show correctly 2. Apply this patch 3. Repeat 1 => SUCESS: They display correctly now 4. Sign off :-D Signed-off-by: Tomas Cohen Arazi --- .mailmap | 70 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/.mailmap b/.mailmap index b22684f10e2..27b8f774f71 100644 --- a/.mailmap +++ b/.mailmap @@ -11,19 +11,24 @@ Aleisha Amohia Alex Arnaud Alex Arnaud = <=> -Alex Sassmannshausen A. Sassmannshausen +Alex Sassmannshausen +Alex Sassmannshausen Allen Reinmeyer Allen Reinmeyer Ambrose Li acli Amit Gupta amit gupta Andrew Arensburger +Andrew Auld +Andrew Auld Andrew Elwell Andrew Fuerste-Henry Andrew Fuerste-Henry +Andrew Isherwood Andrew Nugged Antoine Farnault Arnaud Laurin Arnaud Laurin Artur Norrby +Aude Charillon Aude Charillon Ava Li Azucena Aguayo @@ -49,9 +54,12 @@ Brice Sanchez ByWater Solutions Team Caroline Cyr La Rose +Catrina Berka Charles Farmer Charles Farmer Chloe Alabaster +Chloe Zermatten +Chloe Zermatten Chris Cormack Chris Cormack Chris Cormack @@ -71,7 +79,8 @@ Chris Nighswonger Christophe Torin Claudia Forsman -Colin Campbell +Colin Campbell +Colin Campbell Daniel Banzli Daniel Barker @@ -82,6 +91,8 @@ Darrell Ulm koha root David Cook David Gustafsson +David Roberts +David Roberts David Schmidt David Schuster David Strainchamps @@ -108,6 +119,7 @@ Emmi Takkinen Esther Melander Father Vlasie +Felicie Thiery Fernando Canizo Finlay Thompson @@ -151,10 +163,15 @@ Ian Walls Ian Walls Ian Walls Indranil Das Gupta Indranil Das Gupta (L2C2 Technologies) -Jake Deery +Jacob O'Mara +Jacob O'Mara +Jake Deery +Jake Deery Jake Deery PerplexedTheta -Jake Deery Jane Wagner +Janet McGowan +Janet McGowan +Janne Seppänen Janusz Kaczmarek Jared Camins-Esakov Jared Camins-Esakov @@ -164,6 +181,7 @@ Jatara Barnes Jérôme Charaoui Jérome Vizcaino +Jesse Maseto Jesse Weaver Joe Atzberger Joe Atzberger @@ -173,6 +191,8 @@ Johanna Räisä John Copeland Jonathan Druart +Jonathan Field +Jonathan Field Jono Mingard Jorgia Kelsey Josef Moravec kohamaster @@ -186,7 +206,7 @@ Joshua Ferraro Joshua Ferraro Joy Nelson -Juan Romay Sieira +Juan Romay Sieira Julian Fiol Julian Maurice koha Julian Maurice koha @@ -212,6 +232,7 @@ Kyle M Hall Larry Baerveldt Laura Escamilla +Laurence Rault Leire Diez Liz Rea Liz Rea @@ -231,9 +252,13 @@ Marcel de Rooy Marcel de Rooy Marc Véron -Marjorie Barry-Vila +Mark Gavillet +Mark Gavillet Martin Aubeut +Martin Renvoize Martin Renvoize +Martin Renvoize Mason James Mason James sushi Mason James szrj1m @@ -244,6 +269,11 @@ Mason James Mason James QA Manager Mason James +Mathieu Saby +Mathieu Saby +Matt Blenkinsop +Matt Blenkinsop +Matt Blenkinsop Matthias Le Gac matthias le gac Matthias Le Gac Matthias Meusburger @@ -293,6 +323,8 @@ Paul Poulain Paul Poulain Pawel Skuza +Pedro Amorim +Pedro Amorim Petter Goksøyr Åsen Petter Goksøyr Åsen Philippe Audet-Fortin @@ -319,6 +351,7 @@ Sabrina Kiehl Sally Healey Salman Ali +Sam Lau Sam Sanders Samuel Crosby Savitra Sirohi @@ -391,28 +424,3 @@ Vermont Organization of Koha Automated Libraries VOKAL Vermont Organization of Koha Automated Libraries Vermont Organization of Koha Automated Libraries [http://gmlc.org/index.php/vokal] Virginia Tech Virginia Tech [https://lib.vt.edu/] Waitaki Distict Council Waitaki Distict Council, NZ -Alex Sassmannshausen -Andrew Auld -Andrew Isherwood -Aude Charillon -Chloe Zermatten -Colin Campbell -David Roberts -Jacob O'Mara -Jake Deery -Janet McGowan -Jonathan Field -Mark Gavillet -Martin Renvoize -Matt Blenkinsop -Matt Blenkinsop -Pedro Amorim -Andrew Auld Andrew -Catrina Berka Catrina -Felicie Thiery Felicie -Janne Seppänen Janne -Jesse Maseto JesseM -Kelly McElligott Kelly -Laurence Rault Laurence -Mathieu Saby msaby -Sam Lau Sam -- 2.49.0