This patch adds two entries mapping both addresses I commit from to a single
identity, so the generated files pick up the right name the next time
they are regenerated.
Test plan:
1. Apply patch
2. Run: git check-mailmap "lawrenceol-clams <loreganlloyd@clamsnet.org>"
=> SUCCESS: returns Lawrence O'Regan-Lloyd <loreganlloyd@clamsnet.org>
3. Run: git check-mailmap "lawrenceol <hello@lawrenceol.dev>"
=> SUCCESS: returns Lawrence O'Regan-Lloyd <loreganlloyd@clamsnet.org>
4. Run: git shortlog -sne | grep -i "regan-lloyd"
=> SUCCESS: a single entry, not two
Assisted-By: Claude Opus 5 (Anthropic)
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
We introduced some errant periods in the mailmap which cause parsing
issues.
I also fix the removal of the '=' author by replacing it with a mapping
to the original author of the patch from bug 6979, Robert Fox
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
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>
PTFS Europe is now officially Open Fifth
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Bug 39447: (follow-up) Corrections to existing mappings
I thought it worked through from top to bottom and thus the lower down
mappings would correct the higher up ones.. I was mistaken, thanks
Jonathan for pointing that out
Test with:
1. `git shortlog --summary --numbered --email | grep ptfs-e`
2. `git shortlog --summary --numbered --email | grep openfifth`
Amended-by: Jonathan Druart
Space adjustements
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
The .mailmap had the addresses in the wrong
sequence. The .83 address is actually the correct
one.
How this works is easiest to see in git:
* Apply one of my patches, like bug 31962
* Do a git log
* You'll see the email address without .83 as author
* Apply this patch
* You should see the correct email now in both,
matching the one in the patch file on bugzilla
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
They were in dev_map.yaml, we are cheating with the <sponsor> email but
it seems to work fine in my tests
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Again, we need to adjust our .mailmap
This time the goal is the use it in place of the dev_map.yaml we have in
the release tools.
This will be generated for the release notes, history.txt and
contributors.yaml file
This can be tested using:
git check-mailmap "author <email>"
For instance:
git check-mailmap "Wrong name <jonathan.druart@bugs.koha-community.org>"
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This file is a nightmare, really. We should simplify it and order it correctly.
Letting it here for now, I'd like to run the gitstats command on it to double check the output.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
JD: Amended patch: remove dup occurrences for Brendan
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
The .mailmap file used to generate the stats is different from the one we have in our repo. It's much more complete and should be integrated into Koha.
Test plan:
Confirm that the different mappings are correct
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Email addresses in git seem to be case sensitive.
The list of shortlog -ns was good, but git shortlog -e still made a
difference.
Additionally, reworded initial comments slightly.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Fixes names and mappings for contributors from Oslo Public Library.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
There are still 9 patches of Fridolin under an old email address.
This patch also takes them into account.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Tested by generating the release notes. I noticed that
the 'company' list often has a domain name instead
of a company name, maybe something for another patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
As part of some tidying for the 3.18 release notes, I add this mappings.
To test run the command from the first comment before and after applying
the patch.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Just wanted to add a mailmap entry so that GitStats merges together
the commits I made as "David <dcook@prosentient.com.au>" versus
"David Cook <dcook@prosentient.com.au>".
Also increases accuracy if myself or others does a git shortlog...
_TEST PLAN_
Before applying:
1) Run 'git shortlog --author="dcook@prosentient.com.au"'
2) Note two entries: one for "David" and one for "David Cook".
3) Apply patch
4) Repeat step 1
5) Note only one entry for "David Cook"
Signed-off-by: Magnus Enger <digitalutvikling@gmail.com>
Works as advertised.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adding mailmap for git shortlog to master. Already present in 3.6.X.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Lawrence O'Regan-Lloyd
Martin Renvoize
Jonathan Druart
Tomás Cohen Arazi
Katrin Fischer
Martin Renvoize
Katrin Fischer
Fridolin Somers
Marcel de Rooy
Tomas Cohen Arazi
David Cook