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

build: add a Git .mailmap with my new name #19550

Closed
wants to merge 1 commit into from
Closed

Conversation

mgol
Copy link
Member

@mgol mgol commented Oct 4, 2017

In this way my past contribution is mapped correctly.

PR Checklist

Please check if your PR fulfills the following requirements:

PR Type

What kind of change does this PR introduce?

[ ] Bugfix
[ ] Feature
[ ] Code style update (formatting, local variables)
[x] Refactoring (no functional changes, no api changes)
[ ] Build related changes
[ ] CI related changes
[ ] Documentation content changes
[ ] angular.io application / infrastructure changes
[ ] Other... Please describe:

What is the current behavior?

Git thinks I am two different people.

Issue Number: N/A

What is the new behavior?

Git knows about my new name and maps the old one to the new one.

Does this PR introduce a breaking change?

[ ] Yes
[x] No

Other information

@mgol
Copy link
Member Author

mgol commented Oct 4, 2017

The Travis failures are unrelated to my PR.

@IgorMinar
Copy link
Contributor

@mgol does this affect github ui in some way or only git commands like shortlog?

@mgol
Copy link
Member Author

mgol commented Oct 5, 2017

@IgorMinar GitHub ignores .mailmap, opting instead to association based purely on to whichever GitHub account a mail belongs.

.mailmap is used by git shortlog (see e.g. what git shortlog -nse prints) & git blame. By default it doesn't affect git log or git show, mainly for historical reasons (see http://git.661346.n2.nabble.com/git-log-to-use-mailmap-by-default-td7570862.html). It can be made so in two ways:

  1. By adding a --use-mailmap option: git log --use-mailmap or git show COMMIT_HASH --use-mailmap
  2. By configuring Git globally to respect the .mailmap for logging: git config --global log.mailmap true. When set, this option is also respected for git show.

.mailmap affects what lots of apps outside of the Web GitHub UI present (mainly because Git respects it in many places). For example, it changes what WebStorm shows when you use its "Annotate" feature - a visual representation of git blame inside of the editor.

If you'd like, I can spend a moment to map other people's data; see e.g. what I did in the AngularJS repo: angular/angular.js@8166dd4.

Copy link
Contributor

@IgorMinar IgorMinar left a comment

Choose a reason for hiding this comment

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

ok. can you change the commit label to "build", it's a better fit than refactor. otherwise lgtm

In this way my past contribution is mapped correctly.
@mgol mgol changed the title refactor: add a Git .mailmap with my new name build: add a Git .mailmap with my new name Oct 6, 2017
@mgol
Copy link
Member Author

mgol commented Oct 6, 2017

@IgorMinar PR updated.

@IgorMinar IgorMinar added action: merge The PR is ready for merge by the caretaker target: patch This PR is targeted for the next patch release labels Oct 6, 2017
@tbosch tbosch added this to the Merge-queue milestone Oct 6, 2017
chuckjaz pushed a commit to chuckjaz/angular that referenced this pull request Oct 9, 2017
In this way my past contribution is mapped correctly.

PR Close angular#19550
@chuckjaz chuckjaz closed this in f393d86 Oct 9, 2017
chuckjaz pushed a commit that referenced this pull request Oct 11, 2017
In this way my past contribution is mapped correctly.

PR Close #19550
@mgol mgol deleted the mailmap branch November 2, 2017 09:41
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Sep 12, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants