From c3679d6a9c3a1eb66d17936271a5ce9c40764e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Cohen=20Arazi?= Date: Fri, 3 Oct 2025 15:00:28 -0300 Subject: [PATCH] Bug 40041: Fix structurally incorrect .mailmap entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes malformed entries in .mailmap that were causing display issues and incorrect author mapping. Issues fixed: - Marjorie Barry-Vila: Missing closing '>' in email address - Mathieu Saby: Incorrect alias format instead of proper mailmap format (was using excessive padding with alias, now uses proper 'Name OldName ' format) These structural issues were breaking terminal display in tools like tig and preventing proper author consolidation. Test plan: 1. Apply patch 2. Run: git log --oneline | head -20 => SUCCESS: Authors display correctly 3. Check in tig or other git tools => SUCCESS: No excessive column width issues 4. Verify mailmap functionality: git shortlog -sn | grep -E 'Mathieu|Marjorie' => SUCCESS: Authors properly consolidated 5. Sign off :-D Signed-off-by: Tomás Cohen Arazi Signed-off-by: David Nind --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index b22684f10e..58c012b225 100644 --- a/.mailmap +++ b/.mailmap @@ -231,7 +231,7 @@ Marcel de Rooy Marcel de Rooy Marc Véron -Marjorie Barry-Vila Martin Aubeut Martin Renvoize Mason James @@ -414,5 +414,5 @@ Janne Seppänen Janne JesseM Kelly McElligott Kelly Laurence Rault Laurence -Mathieu Saby msaby +Mathieu Saby msaby Sam Lau Sam -- 2.39.5