Includes:
Update minisketch subtree #32485
pull fanquake wants to merge 2 commits into bitcoin:master from fanquake:update_minisketch_subtree changing 1 files +4 −4-
fanquake commented at 5:10 PM on May 13, 2025: member
-
bf25a0918f
Squashed 'src/minisketch/' changes from d1e6bb8bbf..ea8f66b1ea
ea8f66b1ea Merge sipa/minisketch#89: header: Delete default Minisketch constructor fc24958646 Merge sipa/minisketch#94: misc: trim trailing whitespace 485b16e7ff misc: trim trailing whitespace 5cc7d20866 header: Delete default Minisketch constructor git-subtree-dir: src/minisketch git-subtree-split: ea8f66b1eabb0388d221daaa4706120a5083da0c
-
Update minisketch subtree to latest upstream 46b533dfe6
-
DrahtBot commented at 5:10 PM on May 13, 2025: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage & Benchmarks
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32485.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline for information on the review process.
Type Reviewers ACK willcl-ark, maflcko If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
- fanquake requested review from willcl-ark on May 15, 2025
- willcl-ark approved
-
willcl-ark commented at 8:41 AM on May 16, 2025: member
ACK 46b533dfe6fc6c956ac178896d9caf1d59b73d9f
The changes look correct vs upstream.
Apologies for my git-ignorance, but why are there two commits with the same changes? Is that how a subtree update normally looks?
-
maflcko commented at 8:57 AM on May 16, 2025: member
Apologies for my git-ignorance, but why are there two commits with the same changes? Is that how a subtree update normally looks?
If you want to preserve the subtree, the only way to update is via a merge (I think), so you need one commit for the subtree changes itself and then a merge commit to merge them into this repo.
-
maflcko commented at 8:58 AM on May 16, 2025: member
lgtm ACK 46b533dfe6fc6c956ac178896d9caf1d59b73d9f
The changes look like the merged upstream changes. I haven't run the subtree check locally to confirm.
-
fanquake commented at 9:04 AM on May 16, 2025: member
For reference, the command used here is
git subtree pull --prefix src/minisketch https://github.com/bitcoin-core/minisketch.git master --squash. - fanquake merged this on May 16, 2025
- fanquake closed this on May 16, 2025
- fanquake deleted the branch on May 16, 2025
Contributors