From b39b4475a76c021fecf200a6e7d83998b46e35e8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 18 May 2021 15:48:48 +0200 Subject: [PATCH] Bug 28386: Adjust .mailmap Again, we need to adjust our .mailmap This time the goal is the use it in place of the dev_map.yaml we have in the release tools. This will be generated for the release notes, history.txt and contributors.yaml file This can be tested using: git check-mailmap "author " For instance: git check-mailmap "Wrong name " --- .mailmap | 786 ++++++++++++++++++++++--------------------------------- 1 file changed, 309 insertions(+), 477 deletions(-) diff --git a/.mailmap b/.mailmap index 5a87fa02ea9..ee2f5a36541 100644 --- a/.mailmap +++ b/.mailmap @@ -1,477 +1,309 @@ -Al Banks ahbanks -H. Passini hpassini -Alan Millar amillar -Bruno Toumi btoumi -Pierre Cauchois cauchoip -doXulting doxulting -Benedict P. Barszcz kb2qzv -fisheye fisheye -Francisco M. Marzoa Alonso fmmarzoa -Gavin McCullagh gmccullagh -Friedrich zur Hellen hellen -Jérome Vizcaino plugz -Ambrose Li acli -Mike Mylonas dragon28 -Pierrick Le Gall plg -Gynn Lomax truth_nz -Pat Eyler pate -Andrew Arensburger arensb -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 -Amit Gupta Amit Gupta -Andrei V. Toutoukine Andrei V. Toutoukine -Andrew Elwell Andrew Elwell -Andrew Elwell Andrew Elwell -Andrew Moore Andrew Moore -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 -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 -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 -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 -Frédéric Demians Frédéric DEMIANS -Frédéric Demians Frederic Demians -Frédéric Demians Frederic DEMIANS -Frédéric Demians Frédéric Demians -Frédéric Demians Frédéric DEMIANS -Frédérick Capovilla 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 -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 -Jesse Weaver Jesse Weaver -Jesse Weaver Jesse Weaver -Joshua Ferraro jmf@arwen.metavore.com -Joe Atzberger Joe Atzberger -Joe Atzberger Joe Atzberger -Joe Atzberger Joe Atzberger (siptest -John Beppu John Beppu -John Beppu John Beppu -John Seymour John Seymour -John Soros John Soros -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 -Katrin Fischer Katrin Fischer -Katrin Fischer Katrin Fischer -Katrin Fischer Katrin Fischer -Katrin Fischer Katrin Fischer -Katrin Fischer Katrin Fischer -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 -David Strainchamps lavide -Liz Rea Liz Rea -Liz Rea Liz Rea -Liz Rea Liz Rea -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 -Marcel de Rooy Marcel de Rooy -Marcel de Rooy Marcel de Rooy -Marcel de Rooy marcel@libdevelop.rijksmuseum.nl -Mark Gavillet Mark Gavillet -Martin Renvoize Martin Renvoize -Martin Renvoize Martin Renvoize -Mason James mason.james@liblime.com -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Mason James Mason James -Matthew Hunt Matthew Hunt -Matthias Meusburger Matthias Meusburger -Maxime Pelletier Maxime Pelletier -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 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 -Owen Leonard oleonard -Olwen Williams olwen -Owen Leonard Owen Leonard -Owen Leonard Owen Leonard -Paul Poulain paul -Paul Poulain paul -Paul Poulain Paul POULAIN -Paul Poulain Paul Poulain -Paul Poulain Paul POULAIN -Peter Lorimer Peter Lorimer -Philippe Jaillon Philippe Jaillon -Jesse Weaver Pianohacker -Piotr Wejman Piotr Wejman -Polytechnic University Koha Installation Polytechnic University Koha Installation -Frédérick Capovilla preprod34 -Frédérick Capovilla koha -PTFS PTFS -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 -Richard Anderson ri_chard -Rick Welykochy Rick Welykochy -Robin Sheat Robin Sheat -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 rych -Roger Buck saas -Salvador Zaragoza Rubio Salvador Zaragoza Rubio -David Schuster Schuster -Sébastien Hinderer Sébastien Hinderer -Serge Renaux -Сергій Дубик {Serhij Dubyk} -Stephen Hedges shedges -Simon Blake simon -MJ Ray slef -Sophie Meynieux Sophie Meynieux -Southeastern University Southeastern University -Stan Brinkerhoff Stan Brinkerhoff -Stan Brinkerhoff stan -Stan Brinkerhoff stan -Stéphane Delaune Stephane Delaune -Stephen Edwards Stephen Edwards -Steven Callender Steven Callender -Mason James sushi -Mason James szrj1m -Tümer Garip tgarip1957 -Thatcher Rea Thatcher Rea -Thomas Dukleth thd -Thomas Dukleth thd -Thomas Dukleth Thomas Dukleth -Paul Poulain tipaul -Antoine Farnault toins -Tomás Cohen Arazi Tomas Cohen Arazi -Tomás Cohen Arazi Tomás Cohen Arazi -Steve Tonnesen tonnesen -Ulrich Kleiber Ulrich Kleiber -Vincent Danjean Vincent Danjean -Ward van Wanrooij Ward van Wanrooij -Will Stokes Will Stokes -Wolfgang Heymans Wolfgang Heymans -Mike Hansen wolfpac444 -Zach Sim Zach Sim -Zeno Tajoli Zeno0 Tajoli -Zeno Tajoli Zeno Tajoli -Zeno Tajoli Zeno Tajoli - -# 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 - -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 -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 -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 -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 -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 -Savitra Sirohi -Séverine Queune -शंतनू {Shantanoo} -Sonia Lemaire -Srdjan Janković -Tomás Cohen Arazi -Victor Grousset - - - - - - - - -Alexandra Horsman -Aleisha Amohia - - - -Daniel Barker -John Copeland johnboy -Sam Sanders Sam Sanders -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 -Tomás Cohen Arazi -Bernardo González Kriegel -Bernardo González Kriegel -Simith D'Oliveira -Zeno Tajoli -Zeno Tajoli -Zeno Tajoli -Silvia Simonetti -Paola Rossi -Shaun Evans -Pawel Skuza -Michel Lerenard - -Philippe Blouin - -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 - - - - - - - - - - - - - - - - - +Abby Robertson +Agustín Moyano +Ahmed +Alan Millar +Al Banks +Albert Oller +Albert Oller Albert Oller +Alberto Martinez +Aleisha Amohia +Alexandra Horsman +Alex Arnaud +Alex Arnaud = <=> +Alex Sassmannshausen A. Sassmannshausen +Allen Reinmeyer Allen Reinmeyer +Ambrose Li acli +Amit Gupta amit gupta +Andrew Arensburger +Andrew Elwell +Antoine Farnault +Arnaud Laurin +Arnaud Laurin +Ava Li + +Barton Chittenden +Benedict P. Barszcz +Benjamin Rokseth +Benjamin Rokseth +Benjamin Rokseth +Bernardo González Kriegel +Bernardo González Kriegel +BibLibre Team +BibLibre Team +BibLibre Team +Brandon Haveman +Brendan Gallagher +Brendan Gallagher +Briana Greally +Brice Sanchez +Brice Sanchez +Bruno Toumi +ByWater Solutions Team +Caroline Cyr La Rose +Charles Farmer +Charles Farmer +Chloe Alabaster +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Cormack +Chris Hall +Chris Nighswonger +Chris Nighswonger +Chris Nighswonger +Chris Nighswonger Koha User +Chris Nighswonger +Christophe Croullebois +Claudia Forsman +Colin Campbell + +Daniel Banzli +Daniel Barker +Darrell Ulm Darrell Ulm +Darrell Ulm Darrell Ulm +Darrell Ulm koha +Darrell Ulm root +David Cook +David Gustafsson +David Schuster +David Strainchamps +Dobrica Pavlinušić +Dorian Meid +doXulting +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +D Ruth Bavousett +Duncan Tyler +Elliott Davis + +Emma Nakamura Smith +Emma Nakamura Smith Your Full Name +Emmi Takkinen +Eric Phetteplace +Father Vlasie +Fernando Canizo +Finlay Thompson + +Francisco M. Marzoa Alonso +Frédéric Demians +Frédéric Demians +Frédéric Demians <(frederic@tamil.fr)> +Frédéric Durand +Frédérick Capovilla +Frédérick Capovilla koha +Frédérick Capovilla preprod34 +Frédérick Capovilla +Frère Sébastien Marie Frère Sébastien Marie +Fridolin Somers +Fridolin Somers Admin User Koha +Fridolin Somers +Fridolin Somers +Friedrich zur Hellen +Galen Charlton +Gavin McCullagh +Genevieve Plantin +Genevieve Plantin +Greg Barniskis +Gus Ellerm +Gynn Lomax truth_nz +Héctor Castro +Helene Hickey +Henri-Damien LAURENT +Henri-Damien LAURENT hdl +Henri-Damien LAURENT Henri-Damien LAURENT +Henri-Damien LAURENT +Henri-Damien LAURENT +Holger Meißner +H. Passini +Ian Walls +Ian Walls +Ian Walls +Indranil Das Gupta Indranil Das Gupta (L2C2 Technologies) +Jane Wagner +Janusz Kaczmarek +Jared Camins-Esakov +Jared Camins-Esakov +Jared Camins-Esakov +Jared Camins-Esakov +Jatara Barnes +Jérôme Charaoui +Jérome Vizcaino +Jesse Weaver +Joe Atzberger +Joe Atzberger +Joe Sikowitz +Johan Larsson +John Copeland +John Copeland +Jonathan Druart +Jono Mingard +Jorgia Kelsey +Josef Moravec kohamaster +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joshua Ferraro +Joy Nelson +Juan Sieira +Julian Fiol +Julian Maurice koha +Julian Maurice koha +Justin Vos + +Katrin Fischer +Katrin Fischer +Katrin Fischer +Katrin Fischer Koha +Kenza Zaki +Koha Translators +Kyle M Hall +Kyle M Hall <“staff@bywatersolutions.com”> +Kyle M Hall John Doe +Kyle M Hall koha +Kyle M Hall koha +Kyle M Hall +Kyle M Hall +Kyle M Hall +Larry Baerveldt +Leire Diez +Liz Rea +Liz Rea +Liz Rea +Liz Rea Liz Rea +Liz Rea Liz +Liz Rea root +Liz Rea root +Lyon 3 Team +Lyon 3 Team Lyon3 Team +Magnus Enger +Magnus Enger +Magnus Enger +Marcel de Rooy +Marcel de Rooy +Marcel de Rooy +Marcel de Rooy +Marc Véron +Martin Renvoize +Mason James +Mason James sushi +Mason James szrj1m +Mason James +Mason James +Mason James +Mason James +Mason James +Mason James QA Manager +Mason James +Matthias Meusburger +Maxime Beaulieu +Maxime Beaulieu +Maxime Pelletier +Meenakshi R +Merllissia Manueli +Mengü Yazıcıoğlu +Michael Hafen +Michel Lerenard +Mike Hansen +Mike Mylonas +MJ Ray +MJ Ray +Morag Hills +Morgane Alonso +Nahuel Angelinetti +Nazlı Çetin +Nguyen Duy Tinh +Nicholas Van Oudtshoorn +Nick Clemens +Nick Clemens Koha instance kohadev-koha +Nick Clemens root +Nicolas Morin +Nicole C. Engard +Nicole C. Engard +Nicole C. Engard +Nicole C. Engard +Nicole C. Engard +Nicole C. Engard +Nicole C. Engard +Nicole C. Engard +Nuño López Ansótegui +Olwen Williams +Owen Leonard +Owen Leonard +Owen Leonard +Paola Rossi +Pat Eyler +Paul Poulain +Paul Poulain +Paul Poulain +Paul Poulain +Pawel Skuza +Petter Goksøyr Åsen +Petter Goksøyr Åsen +Philippe Audet-Fortin +Philippe Blouin +Pierre Cauchois +Pierrick Le Gall +Polytechnic University Koha Installation +Pongtawat Chippimolchai +Rachel Hamilton-Williams +Radek Šiman +Raewyn Adams +Remi Mayrand-Provencher +Richard Anderson +Robert Lyon +Robin Sheat +Rochelle Healy +Roger Buck + +Russel Garlick +Ryan Higgins +Ryan Higgins +Sam Sanders +Samuel Crosby +Savitra Sirohi +Serge Renaux +Séverine Queune +Shaun Evans +Silvia Simonetti +Simith D'Oliveira +Simon Blake +Sonia Lemaire +Srdjan Janković +Stan Brinkerhoff +Stan Brinkerhoff +Stéphane Delaune +Stephen Hedges +Steve Tonnesen +Thomas Dukleth +Thomas Dukleth +Thomas Wright +Tomás Cohen Arazi +Tomás Cohen Arazi +Tomás Cohen Arazi + +Tümer Garip +Victor Grousset +Vitor Fernandes +Wajasu +Waylon Robertson +Zeno Tajoli +Zeno Tajoli +Zeno Tajoli +Сергій Дубик {Serhij Dubyk} +शंतनू {Shantanoo} -- 2.20.1