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

Fix up @carols10cents' mailmap entry #39345

Merged
merged 1 commit into from
Jan 28, 2017
Merged

Conversation

steveklabnik
Copy link
Member

The previous ways didn't work; this does.

cc rust-lang-nursery/thanks#45

The previous ways didn't work; this does.

cc rust-lang-nursery/thanks#45
@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 27, 2017

📌 Commit 0f2a5f6 has been approved by alexcrichton

@est31
Copy link
Member

est31 commented Jan 27, 2017

I don't think this will work. According to the manual page one person should always have one line, with the preffered name and email at the start, and any other (or previous) names and emails following in the same line. Also, if somebody used the same email but a different name, it counts as different person, so it needs to be inside the line as well.

Deleting a name from the mailmap won't help, as the name is still mentioned in the git history of rustc.

@est31
Copy link
Member

est31 commented Jan 27, 2017

Mhh, testing git shortlog -sn seems to confirm that nothing bad happened. IDK then.

@steveklabnik
Copy link
Member Author

I checked this locally; before this change, both her names are in there, afterwards, there's only one.

I share your confusion about the man page.

alexcrichton added a commit to alexcrichton/rust that referenced this pull request Jan 28, 2017
…richton

Fix up @carols10cents' mailmap entry

The previous ways didn't work; this does.

cc rust-lang-nursery/thanks#45
bors added a commit that referenced this pull request Jan 28, 2017
@frewsxcv
Copy link
Member

@bors rollup

@bors bors merged commit 0f2a5f6 into rust-lang:master Jan 28, 2017
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.

7 participants