We missed a few mailmap bits in the 25.05.x release
Created attachment 182895 [details] [review] Bug 40041: Update .mailmap Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Created attachment 182952 [details] [review] Bug 40041: mailmap fixes and tidy This patch fixes a couple errors I found in mailmap. Canonical names are added to some emails. Not 100% they are required, but they make sense anyway (i.e. if someone from OpenFifth forgets to set their name, we want the log/release notes to display it correctly regardless). A good example for the need of a canonical mapping is "Sam <samalau@gmail.com>" which we really want to display "Sam Lau" even if they missed to put the complete name. That's when a canonical mapping serves its purpose. To test: 1. Run: $ for i in colin.campbell@openfifth.co.uk chloe.zermatten@openfifth.co.uk martin.renvoize@openfifth.co.uk aude.charillon@openfifth.co.uk andrew.isherwood@ptfs-europe.com matt.blenkinsop@openfifth.co.uk matt.blenkinsip@ptfs-europe.com matt.blenkinsop@ptfs-europe.com andrew.auld@ptfs-europe.com pedro.amorim@ptfs-europe.com msaby mathsabypro@gmail.com marjorie.barry-vila@collecto.ca andrew.auld@openfifth.co.uk catrina@bywatersolutions.com felicie.thiery@biblibre.com janne.seppanen@lahti.fi jesse@bywatersolutions.com kelly@bywatersolutions.com laurence.rault@biblibre.com samalau@gmail.com ; do git check-mailmap -- $i ; done => FAIL: They don't show correctly 2. Apply this patch 3. Repeat 1 => SUCESS: They display correctly now 4. Sign off :-D Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Not sure how to run the commands in step 1 of the test plan - pasting it into the command line gives this error: fatal: unable to parse contact: colin.campbell@openfifth.co.uk fatal: unable to parse contact: chloe.zermatten@openfifth.co.uk ....
(In reply to David Nind from comment #3) > Not sure how to run the commands in step 1 of the test plan - pasting it > into the command line gives this error: > > fatal: unable to parse contact: colin.campbell@openfifth.co.uk > fatal: unable to parse contact: chloe.zermatten@openfifth.co.uk > .... Ohhh. It depends on the git version! * git version 2.49.0: OK * git version 2.39.5 (KTD/bookworm): Error What do we so @ashimema?
(In reply to David Nind from comment #3) > Not sure how to run the commands in step 1 of the test plan - pasting it > into the command line gives this error: > > fatal: unable to parse contact: colin.campbell@openfifth.co.uk > fatal: unable to parse contact: chloe.zermatten@openfifth.co.uk > .... I was also unable to resolve this error.
I'm back to my patches and found this one. I feel like I sent this a year ago... The problem y'all have on reproducing the error and the fix is because of the `git` version as I mentioned. Older Git versions required the email to be in the canonical form, i.e. ``` "<$email>" ``` newer versions allow using raw emails. That's also why it worked for me on my mac host OS. I decided to re-do the patch with other enhancements as well as a revisited test plan that works on any git version.
Created attachment 187423 [details] [review] 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>
Created attachment 187424 [details] [review] Bug 40041: Reorganize and fix .mailmap file - Group same-person entries together for better maintainability - Normalize excessive whitespace padding that breaks terminal tools like tig - Add column alignment with second column at position 65 for readability - Move all sponsor entries to bottom of file - Add missing canonical name mappings for unmapped emails: * Matt Blenkinsop, Andrew Auld, Colin Campbell variations * Mathieu Saby email/username mappings - Remove malformed entry (Alex Arnaud = <=>) - Fix Colin Campbell canonical mapping to OpenFifth email This improves .mailmap functionality in both newer git versions and older versions like those in KTD (git 2.39.5). To test: 1. Run: $ ktd --shell k$ for i in colin.campbell@openfifth.co.uk chloe.zermatten@openfifth.co.uk martin.renvoize@openfifth.co.uk aude.charillon@openfifth.co.uk andrew.isherwood@ptfs-europe.com matt.blenkinsop@openfifth.co.uk matt.blenkinsip@ptfs-europe.com matt.blenkinsop@ptfs-europe.com andrew.auld@ptfs-europe.com pedro.amorim@ptfs-europe.com msaby mathsabypro@gmail.com marjorie.barry-vila@collecto.ca andrew.auld@openfifth.co.uk catrina@bywatersolutions.com felicie.thiery@biblibre.com janne.seppanen@lahti.fi jesse@bywatersolutions.com kelly@bywatersolutions.com laurence.rault@biblibre.com samalau@gmail.com ; do git check-mailmap -- "<$i>" ; done => FAIL: Don't look like canonical email entries 2. Apply this patches 3. Repeat 1 => SUCCESS: They look great! 4. Sign off :-D Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io>
Created attachment 187432 [details] [review] 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>
Created attachment 187433 [details] [review] Bug 40041: Reorganize and fix .mailmap file - Group same-person entries together for better maintainability - Normalize excessive whitespace padding that breaks terminal tools like tig - Add column alignment with second column at position 65 for readability - Move all sponsor entries to bottom of file - Add missing canonical name mappings for unmapped emails: * Matt Blenkinsop, Andrew Auld, Colin Campbell variations * Mathieu Saby email/username mappings - Remove malformed entry (Alex Arnaud = <=>) - Fix Colin Campbell canonical mapping to OpenFifth email This improves .mailmap functionality in both newer git versions and older versions like those in KTD (git 2.39.5). To test: 1. Run: $ ktd --shell k$ for i in colin.campbell@openfifth.co.uk chloe.zermatten@openfifth.co.uk martin.renvoize@openfifth.co.uk aude.charillon@openfifth.co.uk andrew.isherwood@ptfs-europe.com matt.blenkinsop@openfifth.co.uk matt.blenkinsip@ptfs-europe.com matt.blenkinsop@ptfs-europe.com andrew.auld@ptfs-europe.com pedro.amorim@ptfs-europe.com msaby mathsabypro@gmail.com marjorie.barry-vila@collecto.ca andrew.auld@openfifth.co.uk catrina@bywatersolutions.com felicie.thiery@biblibre.com janne.seppanen@lahti.fi jesse@bywatersolutions.com kelly@bywatersolutions.com laurence.rault@biblibre.com samalau@gmail.com ; do git check-mailmap -- "<$i>" ; done => FAIL: Don't look like canonical email entries 2. Apply this patches 3. Repeat 1 => SUCCESS: They look great! 4. Sign off :-D Signed-off-by: Tomás Cohen Arazi <tomascohen@theke.io> Signed-off-by: David Nind <david@davidnind.com>
Testing notes (using ktd): 1. Before the patches: <chloe.zermatten@openfifth.co.uk> <martin.renvoize@openfifth.co.uk> <aude.charillon@openfifth.co.uk> Andrew Isherwood <andrew.isherwood@openfifth.co.uk> <matt.blenkinsop@openfifth.co.uk> Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> Andrew Auld <andrew.auld@openfifth.co.uk> Pedro Amorim <pedro.amorim@openfifth.co.uk> <msaby> Mathieu Saby msaby <mathsabypro@gmail.com> <marjorie.barry-vila@collecto.ca> <andrew.auld@openfifth.co.uk> <catrina@bywatersolutions.com> <felicie.thiery@biblibre.com> <janne.seppanen@lahti.fi> <jesse@bywatersolutions.com> Kelly McElligott <kelly@bywatersolutions.com> <laurence.rault@biblibre.com> <samalau@gmail.com> 2. After the patches: olin Campbell <colin.campbell@ptfs-europe.com> Chloe Zermatten <chloe.zermatten@openfifth.co.uk> Martin Renvoize <martin.renvoize@openfifth.co.uk> Aude Charillon <aude.charillon@openfifth.co.uk> Andrew Isherwood <andrew.isherwood@openfifth.co.uk> Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> Andrew Auld <andrew.auld@openfifth.co.uk> Pedro Amorim <pedro.amorim@openfifth.co.uk> Mathieu Saby <mathsabypro@gmail.com> Mathieu Saby <mathsabypro@gmail.com> Marjorie Barry-Vila <marjorie.barry-vila@collecto.ca> Andrew Auld <andrew.auld@openfifth.co.uk> Catrina Berka <catrina@bywatersolutions.com> Felicie Thiery <felicie.thiery@biblibre.com> Janne Seppänen <janne.seppanen@lahti.fi> Jesse Maseto <jesse@bywatersolutions.com> Kelly McElligott <kelly@bywatersolutions.com> Laurence Rault <laurence.rault@biblibre.com> Sam Lau <samalau@gmail.com>
Created attachment 187448 [details] [review] Bug 40041: Remove duplicated or unecessary entries
Created attachment 187449 [details] [review] Bug 40041: Remove duplicated or unecessary entries
Tomas, can you confirm this follow-up is correct please? (In case I missed something)