Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

chore(*): add a Git .mailmap with my new name #16254

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Conversation

mgol
Copy link
Member

@mgol mgol commented Oct 4, 2017

In this way my past contributions are mapped correctly.

What kind of change does this PR introduce? (Bug fix, feature, docs update, ...)
Chore.

What is the current behavior? (You can also link to an open issue here)
Git thinks I'm 2 people.

What is the new behavior (if this is a feature change)?
I'm one person again.

Does this PR introduce a breaking change?
No.

Please check if the PR fulfills these requirements

Other information:

Output of git shortlog -nse | head -25 after this PR (I see we could use more .mailmap entries, there are lots of duplicates):

   931	Igor Minar <[email protected]>
   692	Misko Hevery <[email protected]>
   677	Peter Bacon Darwin <[email protected]>
   503	Igor Minar <[email protected]>
   364	Vojta Jina <[email protected]>
   364	Matias Niemelä <[email protected]>
   259	Martin Staffa <[email protected]>
   196	Caitlin Potter <[email protected]>
   192	Brian Ford <[email protected]>
   169	Georgios Kalpakas <[email protected]>
   140	Georgios Kalpakas <[email protected]>
   127	Pete Bacon Darwin <[email protected]>
   108	Jason Bedard <[email protected]>
   108	Martin Staffa <[email protected]>
    99	Tobias Bosch <[email protected]>
    94	Michał Gołębiowski <[email protected]>
    71	Lucas Galfaso <[email protected]>
    70	Shahar Talmi <[email protected]>
    65	Jeff Cross <[email protected]>
    52	Chirayu Krishnappa <[email protected]>
    50	rodyhaddad <[email protected]>
    47	Pawel Kozlowski <[email protected]>
    45	Di Peng <[email protected]>
    43	Vojta Jina <[email protected]>
    41	Lucas Mirelmann <[email protected]>

@Narretz
Copy link
Contributor

Narretz commented Oct 4, 2017

Interesting. Maybe that's why for a while my commits are saying Martin Staffa committed with Martin Staffa.
Can you add my canonical email "[email protected]"?

@mgol
Copy link
Member Author

mgol commented Oct 4, 2017

@Narretz I added entries for all the people from top 25 or so that had multiple distinct entries in Git commit history. On your name:

Before:

$ git shortlog -nse | grep -i staffa
   259	Martin Staffa <[email protected]>
   108	Martin Staffa <[email protected]>
     6	Narretz <[email protected]>

After:

$ git shortlog -nse | grep -i staffa
   373	Martin Staffa <[email protected]>

…ntries

In this way:
* my past contributions are mapped correctly
* other people's distinct entries are collapsed into one
@Narretz
Copy link
Contributor

Narretz commented Oct 4, 2017

Cool, thanks. How did you determine which is the canonical email for Igor etc. where it is not exactly clear?

@mgol
Copy link
Member Author

mgol commented Oct 4, 2017

@Narretz Good question! I checked what mail he used in his latest commit to https://github.com/angular/angular; similarly for other people (for some I checked https://github.com/angular/angular.js instead).

@mgol
Copy link
Member Author

mgol commented Oct 4, 2017

BTW, apart from git shortlog, .mailmap is also consulted when git blame-ing. Unfortunately it's not consulted by default for git log or git show but it can be configured to do so:

git config --global log.mailmap true

Copy link
Contributor

@Narretz Narretz left a comment

Choose a reason for hiding this comment

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

Ok, that sounds good. Feel free to merge

@mgol mgol merged commit 8166dd4 into angular:master Oct 4, 2017
@mgol mgol deleted the mailmap branch October 4, 2017 21:24
mgol added a commit that referenced this pull request Oct 4, 2017
In this way:
* my past contributions are mapped correctly
* other people's distinct entries are collapsed into one

Closes #16254
mgol added a commit that referenced this pull request Oct 4, 2017
In this way:
* my past contributions are mapped correctly
* other people's distinct entries are collapsed into one

Closes #16254
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants