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

Update name in acknowledgements and add mailmap #103696

Merged
merged 3 commits into from
Apr 30, 2023

Conversation

amyreese
Copy link
Contributor

I changed my name last year, and would like to update my name in the acknowledgements and git history accordingly.

git-mailmap reference: https://git-scm.com/docs/gitmailmap

I changed my name last year, and would like to update my name in the
acknowledgements and git history accordingly.

git-mailmap reference: https://git-scm.com/docs/gitmailmap
@amyreese amyreese requested a review from a team as a code owner April 22, 2023 21:51
@cpython-cla-bot
Copy link

cpython-cla-bot bot commented Apr 22, 2023

All commit authors signed the Contributor License Agreement.
CLA signed

@AA-Turner
Copy link
Member

From what I can see, GitHub doesn't support the mailmap file (there are discussions about it as early as 2013 that I've found), a recent official confirmation being found here. I don't think it is worth it to add the mailmap file as of this, the recommendation is to add the old email to your profile.

On changing your name in ACKS–I'm not sure what level of proof is reasonable to demonstrate you're the same person! Are you able to log in with an old account that uses that email and leave a confirmatory comment, or an email reply to this issue with your old email address? Perhaps I'm overthinking the issue though.

A

@amyreese
Copy link
Contributor Author

From what I can see, GitHub doesn't support the mailmap file

My Github account already includes my old email addresses, and the commits are associated with my new name, so I'm more concerned with fixing the output of git log|blame|show and associated results in tools that consume git's output.

I'm not sure what level of proof is reasonable to demonstrate you're the same person

Relevant commits are 3a5b0d8 and 6c4fab0.

The old email address is @noswap.com, which is a domain I control, and have relevant posts on the front page showing my new name: https://noswap.com/

@JelleZijlstra
Copy link
Member

I think we should do this even if GitHub itself doesn't support the mailmap file, as it will still apply to local git log invocations.

@JelleZijlstra JelleZijlstra self-assigned this Apr 29, 2023
AlexWaygood and others added 2 commits April 29, 2023 06:17
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@amyreese
Copy link
Contributor Author

I think we should do this even if GitHub itself doesn't support the mailmap file, as it will still apply to local git log invocations.

Good idea! I added your suggested changes.

@JelleZijlstra JelleZijlstra enabled auto-merge (squash) April 30, 2023 03:10
@JelleZijlstra JelleZijlstra merged commit 4b10ecc into python:main Apr 30, 2023
@miss-islington
Copy link
Contributor

Thanks @amyreese for the PR, and @JelleZijlstra for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-104002 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Apr 30, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 30, 2023
I changed my name last year, and would like to update my name in the
acknowledgements and git history accordingly.

git-mailmap reference: https://git-scm.com/docs/gitmailmap

(cherry picked from commit 4b10ecc)

Co-authored-by: Amethyst Reese <amethyst@n7.gg>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@amyreese amyreese deleted the name-change branch April 30, 2023 03:31
JelleZijlstra added a commit that referenced this pull request Apr 30, 2023
…104002)

Update name in acknowledgements and add mailmap (GH-103696)

I changed my name last year, and would like to update my name in the
acknowledgements and git history accordingly.

git-mailmap reference: https://git-scm.com/docs/gitmailmap

(cherry picked from commit 4b10ecc)

Co-authored-by: Amethyst Reese <amethyst@n7.gg>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
@zware
Copy link
Member

zware commented May 1, 2023

Since we've now started down this road, there may be other contributors who would like to be similarly added here, though in most cases we should get direct confirmation from the contributor before adding them. There are also some defunct email addresses in the very long history of the repository, and mapping them to current addresses might be nice.

We also need to edit CODEOWNERS appropriately to avoid requesting review from email-team on every change to the file.

carljm added a commit to carljm/cpython that referenced this pull request May 1, 2023
* main: (26 commits)
  pythongh-104028: Reduce object creation while calling callback function from gc (pythongh-104030)
  pythongh-104036: Fix direct invocation of test_typing (python#104037)
  pythongh-102213: Optimize the performance of `__getattr__` (pythonGH-103761)
  pythongh-103895: Improve how invalid `Exception.__notes__` are displayed (python#103897)
  Adjust expression from `==` to `!=` in alignment with the meaning of the paragraph. (pythonGH-104021)
  pythongh-88496: Fix IDLE test hang on macOS (python#104025)
  Improve int test coverage (python#104024)
  pythongh-88773: Added teleport method to Turtle library (python#103974)
  pythongh-104015: Fix direct invocation of `test_dataclasses` (python#104017)
  pythongh-104012: Ensure test_calendar.CalendarTestCase.test_deprecation_warning consistently passes (python#104014)
  pythongh-103977: compile re expressions in platform.py only if required (python#103981)
  pythongh-98003: Inline call frames for CALL_FUNCTION_EX (pythonGH-98004)
  Replace Netlify with Read the Docs build previews (python#103843)
  Update name in acknowledgements and add mailmap (python#103696)
  pythongh-82054: allow test runner to split test_asyncio to execute in parallel by sharding. (python#103927)
  Remove non-existing tools from Sundry skiplist (python#103991)
  pythongh-103793: Defer formatting task name (python#103767)
  pythongh-87092: change assembler to use instruction sequence instead of CFG (python#103933)
  pythongh-103636: issue warning for deprecated calendar constants (python#103833)
  Various small fixes to dis docs (python#103923)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants