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

gh-99908 Update 'odds and ends' class documentation #100498

Closed
wants to merge 3 commits into from

Conversation

JosephSBoyle
Copy link
Contributor

@JosephSBoyle JosephSBoyle commented Dec 24, 2022

Note: Closed the last PR due to issues with the CLA bot and modified commit authorship (incorrect email was used for my commit).

Modernizes an example in the 'odds and ends' section of the documentation about classes.

@bedevere-bot bedevere-bot added awaiting review docs Documentation in the Doc dir skip news labels Dec 24, 2022
@cpython-cla-bot
Copy link

The following commit authors need to sign the Contributor License Agreement:

Click the button to sign:
CLA not signed

@JosephSBoyle
Copy link
Contributor Author

image

I don't understand why the CLA bot thinks that 'joe.boyle@blackcowtech.uk' needs to sign; I can't see that email in the git history!

Can we ignore it?

@JosephSBoyle JosephSBoyle changed the title Fix issue 99908 gh-99908 Update 'odds and ends' class documentation Dec 24, 2022
@AlexWaygood
Copy link
Member

Unfortunately, the CLA check is "required" in our CI, meaning that we are physically incapable of merging if the check fails. You can see that the "squash and merge" button just isn't available to me on this PR:

8FA85DBB-D79B-4EED-B66D-29B347CF8502

@JosephSBoyle
Copy link
Contributor Author

@AlexWaygood Okay, understood, I'll make a figure it out and let you know when it's sorted!

🖖

@AlexWaygood
Copy link
Member

image

I don't understand why the CLA bot thinks that 'joe.boyle@blackcowtech.uk' needs to sign; I can't see that email in the git history!

Can we ignore it?

Perhaps @ambv can help with this, as one of the authors of the CLA bot :)

@AlexWaygood
Copy link
Member

Closing in favour of #100499

@CAM-Gerlach
Copy link
Member

Just to note, if I pull this branch and use git log or git show -q de102b1, I get the joe.boyle@blackcowtech.uk address as the author, and the same if I check it via the GitHub API (which is what the bot uses). Therefore, the bot operating exactly as it should, as the actual commit pushed to the PR branch has the author set as joe.boyle@blackcowtech.uk.

image

If we look at your screenshot, we can see what is going on—the commit in question is marked replaced, which means the commit being shown locally is not the actual original commit de102b1 , but rather a modified version only visible to you locally. This means either you or a tool you used performed a git replace operation on the commit, and that presumably changed the author email. However, that is not visible external to your local repo, at least without special steps. If you run git --no-replace-objects log, you'll see the actual original commit that was pushed here. For an in depth look at how git replace works, see this SO answer.

Presumably, in your revised PR, you amended/squashed the original commit(s), which created an actual new commit that could then be pushed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting review docs Documentation in the Doc dir skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants