From 037ec2c82fec16ec52a527bb5a1159cb74976c36 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 6 Oct 2020 17:56:16 +0200 Subject: [PATCH] Bug 26621: Adjust .mailmap to reduce the number of invalid authors This file is a nightmare, really. We should simplify it and order it correctly. Letting it here for now, I'd like to run the gitstats command on it to double check the output. Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer JD: Amended patch: remove dup occurrences for Brendan --- .mailmap | 275 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 179 insertions(+), 96 deletions(-) diff --git a/.mailmap b/.mailmap index d70cb18467..5a87fa02ea 100644 --- a/.mailmap +++ b/.mailmap @@ -1,23 +1,27 @@ -ahbanks ahbanks -hpassini hpassini -amillar amillar -btoumi btoumi -cauchoip cauchoip -doxulting doxulting +Al Banks ahbanks +H. Passini hpassini +Alan Millar amillar +Bruno Toumi btoumi +Pierre Cauchois cauchoip +doXulting doxulting +Benedict P. Barszcz kb2qzv fisheye fisheye -fmmarzoa fmmarzoa -gmccullagh gmccullagh -hellen hellen -plugz plugz +Francisco M. Marzoa Alonso fmmarzoa +Gavin McCullagh gmccullagh +Friedrich zur Hellen hellen +Jérome Vizcaino plugz Ambrose Li acli -Mike dragon28 -Pierreck Le Gall plg +Mike Mylonas dragon28 +Pierrick Le Gall plg Gynn Lomax truth_nz Pat Eyler pate Andrew Arensburger arensb -alaurin alaurin +Arnaud Laurin alaurin +Arnaud Laurin alaurin Albert Oller Albert Oller Albert Oller Albert Oller +Alex Sassmannshausen A. Sassmannshausen +Alex Arnaud = <=> Allen Reinmeyer Allen Reinmeyer Allen Reinmeyer Allen Reinmeyer Amit Gupta amit gupta @@ -26,49 +30,60 @@ Andrei V. Toutoukine Andrei V. Toutoukine Andrew Elwell Andrew Elwell Andrew Elwell Andrew Elwell Andrew Moore Andrew Moore -Bernardo Gonzalez Kriegel Bernardo Gonzalez Kriegel -Biblibre biblibre -BibLibre BibLibre -Bob Lyon bob_lyon -Brendan A. Gallagher Brendan A. Gallagher -Brendan A. Gallagher Brendan A. Gallagher -Brendan A. Gallagher brendan -Brendan A. Gallagher brendan -Brendan A. Gallagher Brendan -Brendan A. Gallagher ByWater Solutions -Brendan A. Gallagher Brendan Gallagher -Brendan A. Gallagher Brendan Gallagher +Benjamin Rokseth Koha instance knakk-koha +BibLibre Team +BibLibre Team +BibLibre Team +ByWater Solutions Team +Robert Lyon bob_lyon +Brendan Gallagher Brendan A. Gallagher +Brendan Gallagher Brendan A. Gallagher +Brendan Gallagher brendan +Brendan Gallagher brendan +Brendan Gallagher Brendan +Brendan Gallagher ByWater Solutions +Brendan Gallagher Brendan Gallagher +Brendan Gallagher Brendan Gallagher +Brendan Gallagher Brendan A Gallagher Brian Harrington Brian Harrington Brian Harrington Brian Harrington Brice Sanchez Brice Sanchez -Bryce Sanchez Bryce Sanchez +Brice Sanchez Bryce Sanchez +Brice Sanchez koha-preprod +Kyle M Hall “ByWater <“staff@bywatersolutions.com”> +Kyle M Hall “ByWater <“staff@bywatersolutions.com”> +Kyle M Hall ByWater Migration Support +Kyle M Hall John Doe +Caroline Cyr La Rose caroline Chris Catalfo Chris Catalfo Chris Catalfo Chris Catalfo Chris Cormack chris Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack +Chris Cormack Chris chrisc@catalyst.net.nz Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack Chris Cormack -Christopher Hall Chris Hall -Christopher Hall Christopher Hall +Chris Cormack Chris +Chris Hall Christopher Hall Christophe Croullebois christophe croullebois Chris Nighswonger Chris Chris Nighswonger Chris Nighswonger Chris Nighswonger Chris Nighswonger Chris Nighswonger Chris Nighswonger Chris Nighswonger Chris Nighswonger -conan (aka Fernando L. Canizo) conan (aka Fernando Canizo) -conan (aka Fernando L. Canizo) conan (aka Fernando L. Canizo) Danny Bouman Danny Bouman Darrell Ulm Darrell Ulm Darrell Ulm Darrell Ulm Duncan Tyler Duncan Tyler Duncan Tyler Duncan Tyler +Emma Nakamura Smith Your Full Name +Emma Nakamura Smith +Emmi Takkinen Finlay Thompson finlayt Frédéric Demians f.demians at tamil.fr <(frederic@tamil.fr)> Frédéric Demians Frédéric DEMIANS @@ -81,29 +96,34 @@ Frédérick Capovilla Frédérick Capovilla Frédérick Capovilla Frère Sébastien Marie Frère Sébastien Marie Frère Sébastien Marie Frère Sébastien Marie -Fridolyn SOMERS Fridolyn SOMERS Waylon Robertson genjimoto +Genevieve Plantin genevieve +Genevieve Plantin genevieve Greg Barniskis Greg Barniskis +Gus Ellerm Gus hcpl test hcpl test Henri-Damien LAURENT hdl Henri-Damien LAURENT Henri-Damien LAURENT Henri-Damien LAURENT Henri-Damien LAURENT +Henri-Damien LAURENT root +Henri-Damien LAURENT root Ian Walls Ian Walls Ian Walls Ian Walls Ian Walls Ian Walls +Ian Walls +Indranil Das Gupta Indranil Das Gupta (L2C2 Technologies) Mason James JAMES Mason +Jane Wagner dev2 Janusz Kaczmarek Janusz Kaczmarek -Jared Camins-ESAKOV Jared CAMINS-ESAKOV +Jared Camins-Esakov Jared CAMINS-ESAKOV Jared Camins-Esakov Jared Camins-Esakov Jared Camins-Esakov Jared Camins-Esakov -J. David Bavousett J. David Bavousett -J. David Bavousett J. David Bavousett Jesse Weaver Jesse Weaver Jesse Weaver Jesse Weaver Joshua Ferraro jmf@arwen.metavore.com Joe Atzberger Joe Atzberger Joe Atzberger Joe Atzberger -Joe Atzberger (siptest Joe Atzberger (siptest +Joe Atzberger Joe Atzberger (siptest John Beppu John Beppu John Beppu John Beppu John Seymour John Seymour @@ -112,11 +132,15 @@ Jon Aker Jon Aker Jonathan Druart Jonathan Druart Jono Mingard Jono Mingard Jorgia Kelsey Jorgia Kelsey +Josef Moravec kohamaster Joshua Ferraro joshferraro Joshua Ferraro Joshua Ferraro +Joshua Ferraro hcpl test Joy Nelson Joy Nelson Juan Romay Sieira Juan Romay Sieira Julian Maurice Julian Maurice +Julian Maurice koha +Julian Maurice koha Joshua Ferraro kados Joshua Ferraro kados Joshua Ferraro kados @@ -125,25 +149,29 @@ Katrin Fischer Katrin Fischer Katrin Fischer Katrin Fischer Katrin Fischer Katrin Fischer Katrin Fischer -koha koha -Koha Koha -koha koha -koha koha -koha-preprod koha-preprod -Koha Production Koha Production -Koha User Koha User +Katrin Fischer Koha +Kyle M Hall koha +Kyle M Hall koha +Joshua Ferraro Koha Production +Chris Nighswonger Koha User +Chris Nighswonger Christopher Nighswonger Koustubha Kale Koustubha Kale Kyle M Hall Kyle Hall +Kyle M Hall Kyle Hall Kyle M Hall Kyle M Hall Kyle M Hall Kyle M Hall +Kyle M Hall Koha user Larry Baerveldt Larry Baerveldt Lars Wirzenius Lars Wirzenius -lavide lavide +David Strainchamps lavide Liz Rea Liz Rea Liz Rea Liz Rea Liz Rea Liz Rea -Liz Rea Liz -Lyon3 Team Lyon3 Team +Liz Rea Liz +Liz Rea Liz +Lyon 3 Team Lyon3 Team +Lyon 3 Team Lyon3 Team +Lyon 3 Team Koha Team Lyon 3 Magnus Enger Magnus Enger Marc Balmer Marc Balmer Marc Chantreux Marc Chantreux @@ -171,19 +199,26 @@ Meenakshi.R Meenakshi.R Michael Hafen Michael Hafen Michael Hafen Michael Hafen MJ Ray MJ Ray +Morgane Alonso morgane alonso Nahuel Angelinetti Nahuel Angelinetti Nahuel Angelinetti Nahuel ANGELINETTI Nate Curulla Nate Curulla +Nicholas Van Oudtshoorn +Nick Clemens Nick +Nick Clemens Koha instance kohadev-koha +Nick Clemens root Nicole C. Engard NCE Nicolas Morin Nicolas Morin -Nicole C. Engard Nicole C. Engard -Nicole C. Engard Nicole Engard Nicole C. Engard Nicole Engard -Nicole C. Engard Nicole Engard Nicole C. Engard Nicole Engard Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Engard +Nicole C. Engard Nicole Nuño López Ansótegui Nuño López Ansótegui -NYUHSL NYUHSL Owen Leonard oleonard Olwen Williams olwen Owen Leonard Owen Leonard @@ -193,66 +228,65 @@ Paul Poulain paul Paul Poulain Paul POULAIN Paul Poulain Paul Poulain Paul Poulain Paul POULAIN -pawelzc pawelzc Peter Lorimer Peter Lorimer Philippe Jaillon Philippe Jaillon Jesse Weaver Pianohacker Piotr Wejman Piotr Wejman Polytechnic University Koha Installation Polytechnic University Koha Installation -preprod34 preprod34 -PTFS Contractor PTFS Contractor +Frédérick Capovilla preprod34 +Frédérick Capovilla koha PTFS PTFS -QA Manager QA Manager +Mason James QA Manager Rachel Hamilton-Williams rachelkatipo Chris Cormack rangi +Remi Mayrand-Provencher remi Reed Wade Reed Wade Ricardo Dias Marques Ricardo Dias Marques -ri_chard ri_chard +Richard Anderson ri_chard Rick Welykochy Rick Welykochy Robin Sheat Robin Sheat -root root -root root -root root -root root -root root -root root -root root -root root +Chris Nighswonger root +Kenza Zaki root +Liz Rea root +Liz Rea root +Joshua Ferraro root +Marcel de Rooy +Darrell Ulm root +Darrell Ulm koha +Joshua Ferraro root +Elliott Davis root +David Gustafsson +Koha Translators root Russel Garlick Russel Garlick Russel Garlick Russel Garlick Russel Garlick Russel Garlick Russel Garlick Russel Garlick D Ruth Bavousett ruth@bywatersolutions.com Ryan Higgins Ryan Higgins -Ryan HIggins Ryan HIggins +Ryan Higgins Ryan HIggins Ryan Higgins Ryan Higgins Ryan Higgins Ryan Higgins Ryan Higgins rych -saas saas +Roger Buck saas Salvador Zaragoza Rubio Salvador Zaragoza Rubio -savitra.sirohi savitra.sirohi -Savitra Sirohi Savitra Sirohi -Schuster Schuster +David Schuster Schuster Sébastien Hinderer Sébastien Hinderer -sergerenaux sergerenaux -Serhij Dubyk {Сергій Дубик} Serhij Dubyk {Сергій Дубик} -shaunevans shaunevans +Serge Renaux +Сергій Дубик {Serhij Dubyk} Stephen Hedges shedges Simon Blake simon MJ Ray slef Sophie Meynieux Sophie Meynieux Southeastern University Southeastern University -Srdjan Janković Srdjan Jankovic -Srdjan Janković Srdjan Janković Stan Brinkerhoff Stan Brinkerhoff Stan Brinkerhoff stan Stan Brinkerhoff stan -Stéphane Delaune Stéphane Delaune +Stéphane Delaune Stephane Delaune Stephen Edwards Stephen Edwards Steven Callender Steven Callender Mason James sushi -szrj1m szrj1m -Tumer Garip tgarip1957 +Mason James szrj1m +Tümer Garip tgarip1957 Thatcher Rea Thatcher Rea Thomas Dukleth thd Thomas Dukleth thd @@ -267,65 +301,94 @@ Vincent Danjean Vincent Danjean Ward van Wanrooij Will Stokes Will Stokes Wolfgang Heymans Wolfgang Heymans -wolfpac444 wolfpac444 +Mike Hansen wolfpac444 Zach Sim Zach Sim -Zeno0 Tajoli Zeno0 Tajoli +Zeno Tajoli Zeno0 Tajoli Zeno Tajoli Zeno Tajoli Zeno Tajoli Zeno Tajoli -zifox zifox # This file maintains name/email mappings for git-shortlog use # For more information on the use of this file see: man git-shortlog # Mail to name mapping: email at the right is mapped to name at the left -Mason James -Henri-Damien Laurent +Ahmed +Abby Robertson +Briana Greally +Alberto Martinez Alex Arnaud Benjamin Rokseth Benjamin Rokseth +Brandon Haveman Charles Farmer Charles Farmer Chris Cormack Chris Nighswonger +Claudia Forsman Colin Campbell D Ruth Bavousett David Cook -Frédéric Demians +Eric Phetteplace +Fernando Canizo Frédérick Capovilla +Frédéric Demians +Frédéric Durand Fridolin Somers Fridolin Somers Fridolin Somers +Fridolin Somers Admin User Koha Galen Charlton Greg Barniskis -Ian Walls +Henri-Damien LAURENT +Helene Hickey Holger Meißner +Ian Walls Janusz Kaczmarek Jared Camins-Esakov +Jatara Barnes +Jérôme Charaoui Jonathan Druart +Joe Sikowitz Joy Nelson Juan Sieira +Justin Vos Katrin Fischer Larry Baerveldt +Leire Diez Liz Rea -MJ Ray Magnus Enger Magnus Enger Magnus Enger Marcel de Rooy Marcel de Rooy +Mason James Mason James Matthias Meusburger Maxime Beaulieu +Maxime Beaulieu Maxime Pelletier Meenakshi R -Nicole Engard +Mengü Yazıcıoğlu +Merllissia Manueli +MJ Ray +Nazlı Çetin +Nguyen Duy Tinh +Nicole C. Engard Owen Leonard Paul Poulain Petter Goksøyr Åsen Petter Goksøyr Åsen +Philippe Audet-Fortin +Pongtawat Chippimolchai +Radek Šiman +Raewyn Adams Robin Sheat -Srdjan Jankovic +Savitra Sirohi +Séverine Queune +शंतनू {Shantanoo} +Sonia Lemaire +Srdjan Janković Tomás Cohen Arazi +Victor Grousset @@ -334,20 +397,22 @@ Tomás Cohen Arazi -Alex Horsman +Alexandra Horsman Aleisha Amohia - -johnboy johnboy +Daniel Barker +John Copeland johnboy Sam Sanders Sam Sanders -spartaness spartaness +John Copeland spartaness Morag Hills Rochelle Healy Thomas Wright Genevieve Plantin genevieve Barton Chittenden Barton +Johan Larsson xljoha +Wajasu Tomás Cohen Arazi Tomás Cohen Arazi @@ -360,24 +425,42 @@ Zeno Tajoli Zeno Tajoli Silvia Simonetti Paola Rossi +Shaun Evans +Pawel Skuza +Michel Lerenard -Blou +Philippe Blouin -# Name to name mapping: the name in the right column will be mapped to the name in the left - -Chris Nighswonger Chris R. Nighswonger -Jared Camins-Esakov Jared CAMINS-ESAKOV -Fridolin Somers Fridolyn SOMERS +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett PTFS Contractor +D Ruth Bavousett PTFS +Father Vlasie +Samuel Crosby +Agustín Moyano +Dobrica Pavlinušić +Héctor Castro +Marc Véron +Julian Fiol +Vitor Fernandes +Chloe Alabaster +Daniel Banzli +# Name to name mapping: the name in the right column will be mapped to the name in the left +Mason James +Dorian Meid # Mail to mail mapping: the email addy in the right column will be mapped to the email addy in the left - -- 2.20.1