Skip to content
Please note that GitHub no longer supports Internet Explorer.

We recommend upgrading to the latest Microsoft Edge, Google Chrome, or Firefox.

Learn more

/angular

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
base: master
from

Conversation

Reviewers

@IgorMinar IgorMinar

Assignees
No one assigned
Labels
PR action: merge PR target: master & patch cla: yes
Projects
None yet
Milestone
  Merge-queue
4 participants
@mgol @IgorMinar @googlebot @tbosch
@mgol
Copy link
Member

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

@googlebot googlebot added the cla: yes label Oct 4, 2017

@mgol

This comment has been minimized.

Sign in to view
Copy link
Member Author

mgol commented Oct 4, 2017

The Travis failures are unrelated to my PR.
@IgorMinar

This comment has been minimized.

Sign in to view
Copy link
Member

IgorMinar commented Oct 5, 2017

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

This comment has been minimized.

Sign in to view
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.
@IgorMinar

IgorMinar reviewed Oct 5, 2017
View changes

Copy link
Member

IgorMinar left a comment

ok. can you change the commit label to "build", it's a better fit than refactor. otherwise lgtm
@mgol
build: add a Git .mailmap with my new name 
In this way my past contribution is mapped correctly.
Loading status checks…
b95dbc4

@mgol mgol force-pushed the mgol:mailmap branch from 71b51a1 to b95dbc4 Oct 6, 2017

@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

This comment has been minimized.

Sign in to view
Copy link
Member Author

mgol commented Oct 6, 2017

@IgorMinar PR updated.
@IgorMinar

IgorMinar approved these changes Oct 6, 2017
View changes

@IgorMinar IgorMinar added PR action: merge PR target: master & patch labels Oct 6, 2017

@tbosch tbosch added this to the Merge-queue milestone Oct 6, 2017

chuckjaz added a commit to chuckjaz/angular that referenced this pull request Oct 9, 2017

@mgol @chuckjaz
build: add a Git .mailmap with my new name (angular#19550) 
In this way my past contribution is mapped correctly.

PR Close angular#19550
6350245

@chuckjaz chuckjaz closed this in f393d86 Oct 9, 2017

chuckjaz added a commit that referenced this pull request Oct 11, 2017

@mgol @chuckjaz
build: add a Git .mailmap with my new name (#19550) 
In this way my past contribution is mapped correctly.

PR Close #19550
3d9c2a6

@mgol mgol deleted the mgol:mailmap branch Nov 2, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.