From f6a5738973ce628f83602b26e7c4ba61d4fd42c6 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Mon, 18 Dec 2023 12:36:23 -0800 Subject: [PATCH] Account for duplicate emails with .mailmap 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 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++ CONTRIBUTORS.md | 79 ++++++++++++++++++++++++++++++------------------- 2 files changed, 126 insertions(+), 31 deletions(-) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..5154491d --- /dev/null +++ b/.mailmap @@ -0,0 +1,78 @@ +# 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. + +Andrew Kunz +Antonio Rojas +Bernd +Brecht Van Lommel +CAHEK7 +Cary Phillips +Christina Tempelaar-Lietz +Christopher Kulla +Daniel Kaneider +Dirk Lemstra +Ed Hanway Ed Hanway +Eric Wimmer +Florian Kainz +Gregorio Litenstein +Harry Mallon +Huibean Luo +Jean-Marie Aubry +Jens Lindgren +Ji Hun Yu +Jonathan Stone +Jules Maselbas <54854023+jmaselbas@users.noreply.github.com> +Kazuki Sakamoto +Kimball Thurston +Larry Gritz +Liam Fernandez +Lucas Miller Lucas Miller +Mark Sisson <5761292+marksisson@users.noreply.github.com> +Mathieu Malaterre +Mathieu Westphal +Matthäus G. Chajdas +Matthias C. M. Troffaes +Nicholas Yue +Nick Porcino meshula +Nick Porcino nporcino-pixar <78001580+nporcino-pixar@users.noreply.github.com> +Nick Rasmussen Nick Rasmussen +Nick Rasmussen Nick Rasmussen +Nicolas Chauvet +Nigel Stewart +OgreTransporter +Owen Thompson owdt <33289901+oxt3479@users.noreply.github.com> +Owen Thompson +Peter Hillman +Phyrexian +Piotr Barejko +Piotr Stanczyk +Ralph Potter +Richard Hobbes +Simon Boorer +Thanh Ha +Thorsten Kaufmann +Transporter +Vertexwahn +Xiao Zhai <7610945+zhai-xiao@users.noreply.github.com> +Yujie Shu +Yuya Asano <64895419+sukeya@users.noreply.github.com> +Zachary Klein +すけや <64895419+sukeya@users.noreply.github.com> diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 2298bf0e..972af849 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -4,35 +4,52 @@ This is a list of contributors to the Imath 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 ro submit a PR. -* Andrew Kunz -* Antonio Rojas -* Cary Phillips -* Christina Tempelaar-Lietz -* Daniel Kaneider -* Ed Hanway -* Eric Wimmer -* Florian Kainz -* Gregorio Litenstein -* Harry Mallon -* Huibean Luo -* Jens Lindgren -* Ji Hun Yu -* Jonathan Stone -* Kimball Thurston -* Larry Gritz -* Liam Fernandez -* Mark Sisson -* Nicholas Yue -* Nick Porcino -* Nick Rasmussen -* Nicolas Chauvet -* Owen Thompson -* Peter Hillman -* Piotr Stanczyk -* Ralph Potter -* Simon Boorer -* Thanh Ha -* Thorsten Kaufmann -* Yujie Shu +* Andrew Kunz +* Antonio Rojas +* Brecht Van Lommel +* Cary Phillips +* Christina Tempelaar-Lietz +* Christopher Kulla +* Daniel Kaneider +* Dirk Lemstra +* Ed Hanway +* Eric Wimmer +* Florian Kainz +* Gregorio Litenstein +* Harry Mallon +* Huibean Luo +* Jean-Marie Aubry +* Jens Lindgren +* Ji Hun Yu +* Jonathan Stone +* Jules Maselbas +* Kazuki Sakamoto +* Kimball Thurston +* Larry Gritz +* Liam Fernandez +* Lucas Miller +* Mark Sisson +* Mathieu Malaterre +* Mathieu Westphal +* Matthäus G. Chajdas +* Matthias C. M. Troffaes +* Nicholas Yue +* Nick Porcino +* Nick Rasmussen +* Nicolas Chauvet +* Nigel Stewart +* Owen Thompson +* Peter Hillman +* Piotr Barejko +* Piotr Stanczyk +* Ralph Potter +* Richard Hobbes +* Simon Boorer +* Thanh Ha +* Thorsten Kaufmann +* Xiao Zhai +* Yujie Shu +* Yuya Asano +* Zachary Klein