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

Mailmap #9462

Merged
merged 2 commits into from
Jul 29, 2024
Merged

Mailmap #9462

merged 2 commits into from
Jul 29, 2024

Conversation

rpavlik
Copy link

@rpavlik rpavlik commented Jul 25, 2024

Following up from this: adafruit/Adafruit_CircuitPython_EMC2101#34 Upgrading my name 😉 and otherwise updating the mailmap file.

I have updated the mailmap file in here too. I split my changes into two commits: One is just my own name correction and other changes that I also submitted to the EMC2101 library, the other is my best attempt at cleaning up the output of git shortlog -s -e and git shortlog -s -e -n, without making too many assumptions. That does mean there are duplicates in the shortlog still, because I didn't know which email of multiple valid-looking ones to use.

I did notice a handful of additional "name upgrades", I used git log --author="whatever" and sometimes github accounts to verify I was putting the most recent one in the mailmap, hopefully I got everything right.

(I swear I could spend hours every week updating mailmap files and still not get them all... So I will happily help my siblings when they've committed under both dead and upgraded names on a repo I am already messing with, if the assistance is not unwelcome.)

Feel free to edit, drop the last commit, reject everything except my own name correction, etc.

Here is the diff in git shortlog -s -e for the first commit, probably the easiest way to review it:
authors-1.diff.txt

Here is the diff in git shortlog -s -e for the second commit:
authors.diff.txt

I did not attempt to search the contents of files to update names, since my old name wasn't in any files, just the commit log. Future work I guess.

Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

Thanks again! One primary email suggestion. Good otherwise.

.mailmap Outdated Show resolved Hide resolved
@rpavlik
Copy link
Author

rpavlik commented Jul 26, 2024

There, fixed that.

Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

Thanks Rylie!

@tannewt tannewt merged commit 8350097 into adafruit:main Jul 29, 2024
529 checks passed
@rpavlik rpavlik deleted the mailmap branch August 1, 2024 16:27
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.

2 participants