Skip to content

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Feb 21, 2023

This reverts commit fa24329.

The commit may be signed by my key, but I haven't checked it. Also, I haven't checked the new contrib/verify-commits/trusted-git-root.

@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 21, 2023

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK achow101, glozow

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@Sjors
Copy link
Member

Sjors commented Feb 21, 2023

Commit signature for fab17f0 looks good. I ran a rebased version of #27058 against the old trusted git root, and it doesn't complain about the commit that contains the new one, so I guess that's good.

Calling the commit Revert both confusing and omits the rather critical bit about updating the trusted root.

The following generates a (rather huge) list of revsig commits which can be used in lieu of the root update (see #27058)

git log --format="%H %GK" --merges $(cat contrib/verify-commits/trusted-git-root)..master | grep -E "CE2B75697E69A548" | cut -c -40

Strong preference to merge #27058 first.

@maflcko maflcko changed the title Revert "[contrib] verify-commits: Add MarcoFalke fingerprint" Remove MarcoFalke fingerprint, update trusted-git-root Feb 21, 2023
@maflcko
Copy link
Member Author

maflcko commented Feb 21, 2023

Thanks, changed title. Also happy to close this if someone wants to open a better alternative.

@achow101
Copy link
Member

ACK fab17f0

The key removed matches the fingerprint of the key that I have for Marco Falke and is the same that has been used to sign commits.

With the key removed and the new trusted git root, all commits still verify.

Copy link
Member

@glozow glozow left a comment

Choose a reason for hiding this comment

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

ACK fab17f0

Matches the fingerprint I have for Marco Falke and what has been used to sign commits.
437dfe1 was the last merge signed with this key, and verify-commits.py passes with this trusted root and the key removed.

@glozow glozow merged commit 6758bd7 into bitcoin:master Feb 24, 2023
@maflcko maflcko deleted the 2302-revert-a-commit-🌻 branch February 24, 2023 10:54
@bitcoin bitcoin locked and limited conversation to collaborators Feb 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants