Skip to content

Commit 5eca32d

Browse files
committed
Do a real subtree pull of secp256k1 ff4714e6417c56f7235b287d4a9e555df10e09af
The instructions for doing so are pretty straightforward. Add a secp-zkp remote and fetch from it, then do git subtree --prefix=src/secp256k1 pull --squash secp-zkp <commit> There should be no conflicts (although this one shows a conflict in .gitignore because it seems I forgot to copy that over during the last "manual" subtree update). Git will create a merge commit and you should give this a friendlier message which at least gives the libsecp-zkp commit ID that you're updating to. Importantly, if you forget the --squash you will get confusing error messages because git won't understand how to find the branch it used for the last `subtree pull`.
2 parents 9fe6ac4 + dd97952 commit 5eca32d

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/secp256k1/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
bench_inv
22
bench_ecdh
33
bench_ecmult
4+
bench_generator
5+
bench_rangeproof
6+
bench_schnorrsig
47
bench_sign
58
bench_verify
69
bench_schnorr_verify

0 commit comments

Comments
 (0)