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

Update top-level Git mailmap to normalize commit author variants #4026

Merged
merged 4 commits into from
Jun 26, 2023

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented Jun 22, 2023

This PR updates the top-level mailmap to normalise all historical Bio-Formats contributors and have a single canonical real name and email address per contributor. The following rules are used for the construction of the .mailmap file:

  • for all contributors who were also employees of the University of Dundee, Glencoe Software or the University of Wisconsin, the @dundee.ac.uk, @glencoesoftware.com or @wisc.edu 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 for a discussion about the format of mailmap

These updates aim 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

@melissalinkert melissalinkert left a comment

Choose a reason for hiding this comment

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

Few typos as noted, otherwise looks like these are missing:

2  Aaron Avery <aaron@Aarons-MacBook-Pro.local>
1  JulyChen728 <602114946@qq.com>
3  LambertJohan <45658761+LambertJohan@users.noreply.github.com>
4  Parm0n <ilya.parm@gmail.com>

From https://www.openmicroscopy.org/contributors/ and public mailing list archives, I'd expect those to be:

.mailmap Outdated Show resolved Hide resolved
.mailmap Outdated Show resolved Hide resolved
.mailmap Outdated Show resolved Hide resolved
@sbesson
Copy link
Member Author

sbesson commented Jun 23, 2023

Thanks @melissalinkert. All suggestions/changes pushed to the exception of JulyChen728 for which I have found no information so far.

@dgault dgault added this to the 6.14.0 milestone Jun 26, 2023
@dgault dgault merged commit 64ba63d into ome:develop Jun 26, 2023
17 checks passed
@sbesson sbesson deleted the mailmap branch June 29, 2023 09:09
This pull request was closed.
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