From 7365de5bb00330575bf8fb0ccb46bdacb04a36a1 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. --- .mailmap | 146 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 98 insertions(+), 48 deletions(-) diff --git a/.mailmap b/.mailmap index d70cb18467..526f1e524a 100644 --- a/.mailmap +++ b/.mailmap @@ -1,23 +1,26 @@ -ahbanks ahbanks -hpassini hpassini -amillar amillar -btoumi btoumi -cauchoip cauchoip +Al Banks ahbanks +H. Passini hpassini +Alan Millar amillar +Bruno Toumi btoumi +Pierre Cauchois cauchoip doxulting doxulting 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 +Mike Mylonas Mike Pierreck 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,34 +29,45 @@ Andrei V. Toutoukine Andrei V. Toutoukine Andrew Elwell Andrew Elwell Andrew Elwell Andrew Elwell Andrew Moore Andrew Moore +Benjamin Rokseth Koha instance knakk-koha 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 +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 Gallagher +Brendan Gallagher Brendan A Gallagher +Brendan Gallagher Brendan 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 +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 +Chris Cormack Chris Christopher Hall Chris Hall Christopher Hall Christopher Hall Christophe Croullebois christophe croullebois @@ -69,6 +83,8 @@ 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 Your Full Name Finlay Thompson finlayt Frédéric Demians f.demians at tamil.fr <(frederic@tamil.fr)> Frédéric Demians Frédéric DEMIANS @@ -83,7 +99,10 @@ 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 @@ -91,19 +110,19 @@ Henri-Damien LAURENT Henri-Damien LAURENT 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 -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,8 +131,10 @@ 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 @@ -125,31 +146,35 @@ 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 +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 +Liz Rea Liz Lyon3 Team Lyon3 Team +Lyon3 Team Koha Team Lyon3 Team Magnus Enger Magnus Enger Marc Balmer Marc Balmer Marc Chantreux Marc Chantreux Marcel de Rooy Marcel de Rooy Marcel de Rooy Marcel de Rooy Marcel de Rooy marcel@libdevelop.rijksmuseum.nl +Marc Véron Marc +Marc Véron mveron Mark Gavillet Mark Gavillet Martin Renvoize Martin Renvoize Martin Renvoize Martin Renvoize @@ -171,9 +196,12 @@ 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 +Nick Clemens Nick +Nick Koha instance kohadev-koha Nicole C. Engard NCE Nicolas Morin Nicolas Morin Nicole C. Engard Nicole C. Engard @@ -182,6 +210,12 @@ Nicole C. Engard Nicole Engard Nicole C. Engard Nicole Engard Nicole C. Engard Nicole Engard Nicole C. Engard Nicole Engard +Nicole Engard nce@arwen.metavore.com Nicole Engard +Nicole Engard nce@liblime.com Nicole Engard +Nicole Engard nengard@bywatersolutions.com Nicole Engard +Nicole Engard nengard@gmail.com Nicole Engard +Nicole Engard nicole.engard@liblime.com Nicole Engard +Nicole nicole@bywatersolutions.com Nicole Engard Nuño López Ansótegui Nuño López Ansótegui NYUHSL NYUHSL Owen Leonard oleonard @@ -199,25 +233,32 @@ Philippe Jaillon Philippe Jaillon Pianohacker Piotr Wejman Piotr Wejman Polytechnic University Koha Installation Polytechnic University Koha Installation -preprod34 preprod34 -PTFS Contractor PTFS Contractor +Frédérick Capovilla preprod34 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 Rick Welykochy Rick Welykochy Robin Sheat Robin Sheat -root root -root root -root root -root root -root root -root root -root root -root root +Nick Clemens root root@f1ebe1bec40 +Chris Nighswonger root root@fbcit.campus.foundations.ed +Henri-Damien Laurent root +Henri-Damien Laurent root +Sofiane Elharsal 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 +Koha Translators root Russel Garlick Russel Garlick Russel Garlick Russel Garlick Russel Garlick Russel Garlick @@ -228,7 +269,7 @@ 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 @@ -340,6 +381,7 @@ Aleisha Amohia +daniel Daniel Barker johnboy johnboy Sam Sanders Sam Sanders spartaness spartaness @@ -363,15 +405,23 @@ Paola Rossi Blou +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett PTFS Contractor + # 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 - - - - +Mason James szrj5m +Dorian Meid dnmeid +Daniel Banzli Daniel Bãƒâ¼nzli +Victor Grousset/tuxayo Victor Grousset # Mail to mail mapping: the email addy in the right column will be mapped to the email addy in the left -- 2.20.1