From 12f5fae69bc8267249c40c886320b6c1d05873f4 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Fri, 7 Nov 2025 12:18:22 +0000
Subject: [PATCH] Tools: update canonical authors for credits generator

Previous updates only accounted for AUTHORS which doesn't
overlap with credits which includes different directories.
---
 AUTHORS                                   |  6 ++---
 tools/utils/git_data_canonical_authors.py | 31 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index f4846065712..d6c1844e539 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -173,7 +173,7 @@ Christian Rauch <Rauch.Christian@gmx.de>
 Christian Stolze <regcs>
 Christoph Lendenfeld <chris.lenden@gmail.com>
 Christoph Neuhauser <christoph.neuhauser@intel.com>
-Christophe Hery <chery>
+Christophe Hery <chery@fb.com>
 Christopher Peerman <chris_82>
 Cian Jinks <cjinks99@gmail.com>
 Clément Busschaert <clement.busschaert@gmail.com>
@@ -518,7 +518,7 @@ Marco Rotili <marco.livio.rotili@gmail.com>
 Marcos Perez <pistolario>
 Marino Toscano <marino.toscano@gmail.com>
 Mark Ayers <markthema3@gmail.com>
-Mark Stead <Scumbag>
+Mark Stead <mark@stead.id.au>
 Mark van de Ruit <mark@blender.org>
 Martijn Berger <mberger@denc.com>
 Martijn Versteegh <martijn@aaltjegron.nl>
@@ -621,7 +621,7 @@ NueSB <moocowperson@gmail.com>
 Octave C <toctave>
 Odréanne Breton <odreanne.breton@ubisoft.com>
 Olivier Jolly <zeograd>
-Olivier Maury <omaury>
+Olivier Maury <omaury@meta.com>
 Omar Emara <mail@OmarEmara.dev>
 Oscar Blumberg <carnaval@12-10e.me>
 Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
diff --git a/tools/utils/git_data_canonical_authors.py b/tools/utils/git_data_canonical_authors.py
index 6568da88078..5cf8faefdac 100644
--- a/tools/utils/git_data_canonical_authors.py
+++ b/tools/utils/git_data_canonical_authors.py
@@ -58,6 +58,11 @@ def canonical_author_map() -> dict[str, str]:
         "Aleksandr Zinovev <roaoao@gmail.com>": (
             "raa <roaoao@gmail.com>",
         ),
+        "Alex Fuller <boberfly@gmail.com>": (
+            "Alex <boberfly@gmail.com>",
+            "Alex Fuller <boberfly@noreply.localhost>",
+            "Alex Fuller <mistaed>",
+        ),
         "Alexander Gavrilov <angavrilov@gmail.com>": (
             "Alexander Gavrilov <alexander.gavrilov@jetbrains.com>",
         ),
@@ -216,6 +221,9 @@ def canonical_author_map() -> dict[str, str]:
             "Christoph Lendenfeld <chris.lend@gmx.at>",
             "Christoph Lendenfeld <chrislend@noreply.localhost>",
         ),
+        "Christophe Hery <chery@fb.com>": (
+            "Christophe Hery <chery>",
+        ),
         "Clément Foucault <foucault.clem@gmail.com>": (
             "Clment Foucault <fclem>",
             "Clment Foucault <foucault.clem@gmail.com>",
@@ -477,6 +485,9 @@ def canonical_author_map() -> dict[str, str]:
             "Joseph Eagar <joeedh>",
             "Joseph Eagar <josepheagar@noreply.localhost>",
         ),
+        "Josh Belanich <jbelanich@gmail.com>": (
+            "Josh Belanich <jbelanich>",
+        ),
         "Josh Maros <joshm-2@noreply.localhost>": (
             "Josh Maros <60271685+joshua-maros@users.noreply.github.com>",
             "joshua-maros <60271685+joshua-maros@users.noreply.github.com>",
@@ -581,6 +592,9 @@ def canonical_author_map() -> dict[str, str]:
         "Marcos Perez <pistolario>": (
             "Marcos Perez <pistolario@noreply.localhost>",
         ),
+        "Mark Stead <mark@stead.id.au>": (
+            "Mark Stead <Scumbag>",
+        ),
         "Martijn Berger <mberger@denc.com>": (
             "Martijn Berger <martijn.berger@gmail.com>",
             "Martijn Berger <mberger@denc.nl>",
@@ -679,6 +693,10 @@ def canonical_author_map() -> dict[str, str]:
         ),
         "Nikita Sirgienko <nikita.sirgienko@intel.com>": (
             "Nikita Sirgienko <sirgienko>",
+            "Nikita Sirgienko <sirgienko@noreply.localhost>",
+        ),
+        "Olivier Maury <omaury@meta.com>": (
+            "Olivier Maury <omaury>",
         ),
         "Omar Emara <mail@OmarEmara.dev>": (
             "Omar Emara <OmarSquircleArt>",
@@ -726,6 +744,9 @@ def canonical_author_map() -> dict[str, str]:
             "Pavel \u0160eve\u010dek <pavel-sevecek@noreply.localhost>",
             "pavel <sevecek@sirrah.troja.mff.cuni.cz>",
         ),
+        "Pedro A <povmaniac@noreply.localhost>": (
+            "Pedro A <povmaniaco>",
+        ),
         "Philipp Oeser <philipp@blender.org>": (
             "Philipp Oeser <info@graphics-engineer.com>",
             "Philipp Oeser <lichtwerk>",
@@ -780,6 +801,7 @@ def canonical_author_map() -> dict[str, str]:
             "Robin Hohnsbeen <robin-4@noreply.localhost>",
         ),
         "Sahar A. Kashi <sahar.alipourkashi@amd.com>": (
+            "Sahar A. Kashi  <sahar.alipourkashi@amd.com>",
             "Sahar A. Kashi <salipour@noreply.localhost>",
             "Sahar Kashi <sahar.kashi@amd.com>",
             "salipourto <sahar.alipourkashi@amd.com>",
@@ -794,6 +816,9 @@ def canonical_author_map() -> dict[str, str]:
         "Sean Kim <SeanCTKim@protonmail.com>": (
             "Sean Kim <sean-kim@noreply.localhost>",
         ),
+        "Sean Stirling <sean.stirling@codeplay.com>": (
+            "Sean Stirling <sstirlin@qti.qualcomm.com>",
+        ),
         "Sebastian Herholz <sebastian.herholz@intel.com>": (
             "Sebastian Herholz <Sebastian.Herholz@gmail.com>",
             "Sebastian Herholz <sherholz>",
@@ -952,9 +977,15 @@ def canonical_author_map() -> dict[str, str]:
             "EaryChow <zhouzijun200047@163.com>",
             "Zijun Zhou <eary@noreply.localhost>",
         ),
+        "bartus <bartus@noreply.localhost>": (
+            "bartus <szczepaniak.bartek+github@gmail.com>",
+        ),
         "dupoxy <dupoxy@gmail.com>": (
             "dupoxy <dupoxy@noreply.localhost>",
         ),
+        "howetuft <howetuft@gmail.com>": (
+            "howetuft <howetuft>",
+        ),
         "jon denning <gfxcoder@gmail.com>": (
             "Jon Denning <gfxcoder>",
         ),