diff options
author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-05-25 13:27:40 +0200 |
---|---|---|
committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-05-25 13:27:45 +0200 |
commit | b4f686952a60bbadc7ed2250651d0d6af0959f4d (patch) | |
tree | 16bf65a448225b4398e51695ad9300fdc9aa4d40 /doc | |
parent | 8c721fff3a007db613b22464b40fe7cd6b1ead80 (diff) | |
parent | d4b3dc5b0a726cc4cc7a8467be43126e78f841cf (diff) | |
download | bitcoin-b4f686952a60bbadc7ed2250651d0d6af0959f4d.tar.xz |
Merge bitcoin/bitcoin#25197: contrib: Remove keys that are no longer used for merging
d4b3dc5b0a726cc4cc7a8467be43126e78f841cf contrib: Remove keys that are no longer used for merging (Hennadii Stepanov)
Pull request description:
See:
- https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-21#726591
- https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-12-09#750000
Also updated `trusted-git-root` to be right after **meshcollider**'s last merge.
The latest similar change was bitcoin/bitcoin#7713.
A related discussion on [IRC](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727090):
> [12:28](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727090) \<MarcoFalke> jonasschnelli: I was about to ask you whether you planned to remove your fingerprint from the "trusted-keys" for merging, but it looks like this will break verify-commits ...
> [12:31](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727091) \<laanwj> you would also have a add all his merge commits to exceptions, i guess
> [12:32](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727092) \<laanwj> or patch the script to allow different key for different ranges of commits
> [13:15](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727118) \<jonasschnelli> MarcoFalke: I had no plan to remove my keyid,… would that make sense and how would you fix verify commits?
> [13:16](https://bitcoin-irc.chaincode.com/bitcoin-core-dev/2021-10-22#727119) \<jonasschnelli> Ideally, we should set en expiration date next to those keyid
ACKs for top commit:
laanwj:
ACK d4b3dc5b0a726cc4cc7a8467be43126e78f841cf
Tree-SHA512: 6c23c932288b56b546a9ba45288205fae063e3f98ff308393acffd5d79eb5097417de1c3d8e865a3f66734740ca2388b2452c3c810e45cdf3b15ccfa215f574e
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions