8000 [3.11] gh-116472: Replace literal newlines with escape characters in MSBuild files (GH-116473) by miss-islington · Pull Request #116475 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

[3.11] gh-116472: Replace literal newlines with escape characters in MSBuild files (GH-116473) #116475

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

Merged
merged 1 commit into from
Mar 7, 2024

Conversation

miss-islington
Copy link
Contributor
@miss-islington miss-islington commented Mar 7, 2024

…SBuild files (pythonGH-116473)

(cherry picked from commit 5d0cdfe)

Co-authored-by: Dan Albert <dan@gingerhq.net>
@miss-islington miss-islington requested a review from a team as a code owner March 7, 2024 21:53
@ghost
Copy link
ghost commented Mar 7, 2024

All commit authors signed the Contributor License Agreement.
CLA signed

@DanAlbert
Copy link
Contributor

It's blocked because the bot used the wrong co-author email when it did the cherry-pick. It should have re-used the committer email from the original commit, but it seems like it used my github default email instead? Is there a way I can fix that?

@zooba
Copy link
Member
zooba commented Mar 7, 2024

I'm looking now... what was the email on the original commit? I might be able to edit it in

@DanAlbert
Copy link
Contributor

Actually no, I think my committer email on the PR was wrong, but for some reason the CLA bot on the PR got it right? I'm looking too.

@DanAlbert
Copy link
Contributor

Alright, my PR was uploaded with the @google.com address, but the bot that merged it re-authored it to the github default (which is basically a spam address). Not ideal, but it's in the history now, so oh well. I'll resign the CLA with the other email.

@DanAlbert
Copy link
Contributor

Correction: not the bot that merged it, you did that :) I guess GitHub does that for some types of merges, and I should just change my default email.

@zooba
Copy link
Member
zooba commented Mar 7, 2024

I hit merge, but I don't get any option to change the email address used. I guess it's using your default, though I did think it was better about preserving the original commit when there's only a single one.

@zooba zooba merged commit 22c38a6 into python:3.11 Mar 7, 2024
@DanAlbert
Copy link
Contributor

Yeah, sorry, didn't mean to imply it was intentional :) I've never noticed it before, but I guess it's been doing that to me every time.

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.

3 participants
0