Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add top-level Git mailmap to normalize commit author variants #375

Merged
merged 2 commits into from
Jul 12, 2023

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented Jun 22, 2023

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:

  • for all contributors who are employees of the University or Dundee, Glencoe Software, the @dundee.ac.uk, or @glencoesoftware.com email address is used as the canonical email address
  • for all contributors with an executed CLA, the real name and email address sent via the CLA is used as the canonical address
  • for all contributors, the name used in https://www.openmicroscopy.org/teams/ or https://www.openmicroscopy.org/contributors/ is used as the canonical real name.

The .mailmap is constructed according to the official documentation using one of the two forms:

Proper Name <proper@email.xx> <commit@email.xx>

for mapping different email addresses and

Proper Name <proper@email.xx> Commit Name <commit@email.xx>

for mapping different real names.

The unique list of commit authors can be generated and reviewing using git shortlog -se

See also ome/openmicroscopy#6349, ome/bioformats#4026 and ome/omero-web#482

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.
Copy link
Member

@joshmoore joshmoore left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and other approvals == quick read through of all and full check of my own entries.

@jburel jburel merged commit ddb80f6 into ome:master Jul 12, 2023
@sbesson sbesson deleted the mailmap branch July 17, 2023 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants