From d65a626cbae3fc182af4603e1c4b1194ecaf1a8d Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Wed, 20 Dec 2023 11:18:50 -0800 Subject: [PATCH] Account for duplicate emails with .mailmap (#1597) The .mailmap file maps author/committer names and emails to canonical real names and email addresses. This also updates the CONTRIBUTORS.md file with missing names from the git logs. This information is to the best of our knowledge, but please submit any corrections if you prefer. Signed-off-by: Cary Phillips --- .mailmap | 163 ++++++++++++++++++++++++++++++++++++++++++++++++ CONTRIBUTORS.md | 49 ++++++++++++++- 2 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000000..0a4af87add --- /dev/null +++ b/.mailmap @@ -0,0 +1,163 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) Contributors to the OpenEXR Project. +# +# This file establishes email equivalences so we can resolve what look like +# multiple authors, but actually are the same author who has used multiple +# emails over the course of their involvement with the project. +# +# The format is any of the following: +# +# CANONICAL-NAME +# CANONICAL-NAME alternate-name +# +# You can check for duplicates with this command: +# git shortlog -sne --all +# That command (and others) will use this file to collapse the duplicates. +# +# If you see any duplicates we don't account for here, or if you look at your +# own entry here and want a different name or email to be your canonical one +# (we may not have guessed correctly and matched your preferences), please +# file a PR with the edits to this file. + +Aaron Demolder +Abe Fettig +Aloys Baillet aloysb +Andrew Kunz +Anton Dukhovnikov Anton Dukhovnikov <131838425+antond-weta@users.noreply.github.com> +Antonio Rojas +Aras Pranckevičius Aras Pranckevičius +Aras Pranckevičius Aras Pranckevičius +Arkady Shapkin +Arkell Rasiah Arkell Rasiah +Arkell Rasiah Arkell Rasiah +Axel Waggershauser +axxel +Balázs Oroszi +Barnaby Robson Barnaby Robson +Ben Grimes <72311676+MrGlobby@users.noreply.github.com> +Bernd +Brendan Bolles +CAHEK7 +Cary Phillips cary-ilm +Cary Phillips Cary Phillips +Cary Phillips seabeepea +Catherine +Chris Leu cdleu430 +Christina Tempelaar-Lietz ¨Christina Tempelaar-Lietz¨ +Christina Tempelaar-Lietz xlietz <31363633+xlietz@users.noreply.github.com> +Christopher Horvath +Christopher Kulla +Christoph Gohlke +cia-rana +Cristian Martínez +Dan Horák +Daniel Kaneider +Darby Johnston +Dave Sawyer +David Korczynski +Developer-Ecosystem-Engineering <65677710+Developer-Ecosystem-Engineering@users.noreply.github.com> +dgmzc +Diogo Teles Sant'Anna +Dirk Lemstra dirk +dracwyrm +Drew Hess +Ed Hanway Ed Hanway +Edward Kmett +Eric Sommerlade +Eric Wimmer +E Sommerlade +fgc +Florian Kainz +Grant Kim <6302240+enpinion@users.noreply.github.com> +Gregorio Litenstein +Gyula Gubacsi +Halfdan Ingvarsson +Harry Mallon +Huibean Luo +ianianda +Ibraheem Alhashim +Jack Kingsman +Jamie Kenyon +Jan Tojnar +jbradley +Jean-Francois Panisset <32653482+jfpanisset@users.noreply.github.com> +Jens Lindgren +Ji Hun Yu +Johannes Vollmer <32042925+johannesvollmer@users.noreply.github.com> +John Loy +John Mertic +Jonathan Stone +Jose Luis Cercos-Pita Jose Luis Cercós Pita +Joseph Goldstone Joseph Goldstone +Juha Reunanen +Julian Amann +Juri Abramov Juri Abramov +Juri Abramov JuriAbramov +Karl Hendrikse karlhendrikse +Karl Rasche Karl Rasche +Kevin Wheatley +Kimball Thurston +kwizart +Larry Gritz +Laurens Voerman +L. E. Segovia +Liam Fernandez +lilinjie +Lucy Wilkes +luzpaz +mancoast +mandree +Mark Reid +Mark Sisson <5761292+marksisson@users.noreply.github.com> +Martin Aumüller +Martin Husemann +Matthäus G. Chajdas +Matthias C. M. Troffaes +Matt Pharr +Md Sadman Chowdhury <61442059+SpicyCatGames@users.noreply.github.com> +Michael Thomas (malinka) +Nicholas Yue +Nick Porcino meshula +Nick Porcino Nick Porcino +Nick Porcino Nick Porcino +Nick Porcino nporcino-pixar <78001580+nporcino-pixar@users.noreply.github.com> +Nick Rasmussen Nick Rasmussen +Nick Rasmussen Nick Rasmussen +Nicolas Chauvet +Niklas Hambüchen +OgreTransporter +oleksii.vorobiov +Owen Thompson +patlefort +Paul Schneider +Peter Hillman peterhillman +Peter Hillman peterhillman +Peter Steneteg +Peter Urbanec +Phyrexian +Piotr Stanczyk Piotr +Piotr Stanczyk Piotr Stanczyk +Piotr Stanczyk pstanczyk +Ralph Potter +r-a-sattarov +Rémi Achard +Reto Kromer +Richard Goedeken +Sergey Fedorov +Shawn Walker-Salas +Simon Boorer +Simon Otter +Srinath Ravichandran +Thanh Ha +Thomas Debesse +Thorsten Kaufmann +Timothy Lyanguzov +Transporter +Vertexwahn +Wenzel Jakob +Wojciech Jarosz wjarosz +Xo Wang +Yaakov Selkowitz +Yining Karl Li +Yujie Shu Yujie Shu (Intern) +zengwei2000 <102871671+zengwei2000@users.noreply.github.com> diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9fde40b23f..3178a815d4 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -4,20 +4,37 @@ This is a list of contributors to the OpenEXR project, sorted alphabetically by first name. -If you know of missing, please email: info@openexr.com. - +If you know of missing, please email info@openexr.com or submit a PR. + +* Aaron Demolder +* Abe Fettig * Aloys Baillet * Andre Mazzone * Andrew Kunz +* Anton Dukhovnikov +* Antonio Rojas +* Aras Pranckevičius * Arkady Shapkin * Arkell Rasiah +* Axel Waggershauser +* Balázs Oroszi +* Barnaby Robson +* Ben Grimes * Brendan Bolles * Cary Phillips +* Chris Leu * Christina Tempelaar-Lietz * Christopher Horvath * Christopher Kulla +* Christoph Gohlke +* Cristian Martínez +* Dan Horák * Daniel Kaneider * Darby Johnston +* Dave Sawyer +* David Korczynski +* Diogo Teles Sant'Anna +* Dirk Lemstra * Drew Hess * Ed Hanway * Edward Kmett @@ -25,47 +42,75 @@ If you know of missing, please email: info@openexr.com. * Eric Wimmer * E Sommerlade * Florian Kainz +* Grant Kim +* Gregorio Litenstein +* Gyula Gubacsi * Halfdan Ingvarsson * Harry Mallon +* Huibean Luo * Ibraheem Alhashim * Jack Kingsman * Jamie Kenyon * Jan Tojnar +* Jean-Francois Panisset +* Jens Lindgren * Ji Hun Yu +* Johannes Vollmer * John Loy * John Mertic * Jonathan Stone +* Jose Luis Cercos-Pita +* Joseph Goldstone +* Juha Reunanen * Julian Amann * Juri Abramov +* Karl Hendrikse * Karl Rasche * Kevin Wheatley * Kimball Thurston * Larry Gritz +* Laurens Voerman +* L. E. Segovia * Liam Fernandez * Lucy Wilkes +* Mark Reid +* Mark Sisson +* Martin Aumüller +* Martin Husemann * Matthäus G. Chajdas +* Matthias C. M. Troffaes +* Matt Pharr +* Md Sadman Chowdhury * Michael Thomas * Nicholas Yue * Nick Porcino * Nick Rasmussen * Nicolas Chauvet * Niklas Hambüchen +* OgreTransporter * Owen Thompson * Paul Schneider * Peter Hillman * Peter Steneteg +* Peter Urbanec * Phil Barrett * Piotr Stanczyk * Ralph Potter +* Rémi Achard * Reto Kromer * Richard Goedeken +* Sergey Fedorov * Shawn Walker-Salas +* Simon Boorer * Simon Otter * Srinath Ravichandran * Thanh Ha +* Thomas Debesse * Thorsten Kaufmann +* Timothy Lyanguzov * Wenzel Jakob * Wojciech Jarosz * Xo Wang +* Yaakov Selkowitz * Yining Karl Li * Yujie Shu