gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 40041: Fix structurally incorrect .mailmap entries 

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 <email> OldName <email>' 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 <tomascohen@theke.io>
Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 6c3153a481)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Tomás Cohen Arazi 2025-10-03 15:00:28 -03:00 committed by Paul Derscheid
parent 1ad044b981
commit 52b59aa736
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.mailmap
View File

@ -231,7 +231,7 @@ Marcel de Rooy <m.de.rooy@rijksmu
Marcel de Rooy <m.de.rooy@rijksmuseum.nl> <M.de.Rooy@rijksmuseum.nl>
Marcel de Rooy <m.de.rooy@rijksmuseum.nl> <root@master.rijkskoha.nl>
Marc Véron <veron@veron.ch>
Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca
Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca>
Martin Aubeut <martin.aubeut@gmail.com> <martin.aubeut@gmail.com>
Martin Renvoize <martin.renvoize@openfifth.co.uk> <martin@dev1.vm.bytemark.co.uk>
Mason James <mason.james@liblime.com>
@ -414,5 +414,5 @@ Janne Seppänen <janne.seppanen@lahti.fi> Janne <janne.sepp
Jesse Maseto <jesse@bywatersolutions.com> JesseM <jesse@bywatersolutions.com>
Kelly McElligott <kelly@bywatersolutions.com> Kelly <kelly@bywatersolutions.com>
Laurence Rault <laurence.rault@biblibre.com> Laurence <laurence.rault@biblibre.com>
Mathieu Saby msaby <mathsabypro@gmail.com>
Mathieu Saby <mathsabypro@gmail.com> msaby <mathsabypro@gmail.com>
Sam Lau <samalau@gmail.com> Sam <samalau@gmail.com>