Add top-level Git mailmap to normalize commit author variants #366
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This mapping file aims to associate all commits from the same contributor to a single "First Name Last Name <email>" author line. The University of Dundee or the Glencoe Software email address are used as the canonical address for current employees of these institutions. For contributors with an executed CLA, the email address specified in the CLA is used as the canonical one.
jburel
reviewed
Aug 5, 2023
| Jean-Marie Burel <[email protected]> jean-marie burel <[email protected]> | ||
| Josh Moore <[email protected]> <[email protected]> | ||
| Josh Moore <[email protected]> <[email protected]> | ||
| Josh Moore <[email protected]> <[email protected]> |
There was a problem hiding this comment.
Suggested change
| Josh Moore <[email protected]> <[email protected]> | |
| Josh Moore <[email protected]> jmoore <[email protected]> |
There was a problem hiding this comment.
Looks like this email address was used with different author names so I would need to add one more line if we want to use the most verbose variant. Let me know if that is your preference
There was a problem hiding this comment.
This could make things more complicated. Let's keep it as it is
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds a top-level mapping file allowing to normalize commits from the same contributor and associate all commits to a canonical "First Name Last Name " author line.
The following rules are used for the construction of the .mailmap file:
@dundee.ac.uk, or@glencoesoftware.comemail address is used as the canonical email addressThe .mailmap is constructed according to the official documentation using one of the two forms:
for mapping different email addresses and
for mapping different real names.
The unique list of commit authors can be generated and reviewing using
git shortlog -seSee also ome/openmicroscopy#6349, ome/bioformats#4026, ome/omero-web#482, ome/omero-py#375 and ome/omero-scripts#208