Skip to content

Latest commit

 

History

History
104 lines (82 loc) · 3.91 KB

subtree-merge.md

File metadata and controls

104 lines (82 loc) · 3.91 KB

Upstream Subtree Merge

How to Verify

If you wanted to verify a merge of the upstream secp256k1 repo into bitcoin/bitcoin. i.e PR #22448.

pushd bitcoin

git fetch upstream pull/22448/head:22448

git checkout 22448

git fetch https://github.com/bitcoin-core/secp256k1
remote: Enumerating objects: 6714, done.
remote: Counting objects: 100% (491/491), done.
remote: Compressing objects: 100% (222/222), done.
remote: Total 6714 (delta 310), reused 371 (delta 268), pack-reused 6223
Receiving objects: 100% (6714/6714), 2.92 MiB | 165.00 KiB/s, done.
Resolving deltas: 100% (4678/4678), done.
From https://github.com/bitcoin-core/secp256k1
 * branch                HEAD       -> FETCH_HEAD

./test/lint/git-subtree-check.sh src/secp256k1
src/secp256k1 in HEAD currently refers to tree b7f4357396a8a5f073bf628567ef10b2e2edd410
src/secp256k1 in HEAD was last updated in commit c020cbaa5c8e9e61b2b8efd8dc09be743fcd4273 (tree b7f4357396a8a5f073bf628567ef10b2e2edd410)
GOOD

Historical Subtree Updates

python-bitcoinrpc (removed)

univalue (removed)