Skip to content

Commit fa4b8b1

Browse files
author
MarcoFalke
committed
test: Add missing ipc subtree to lint
1 parent 638a4c0 commit fa4b8b1

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

doc/developer-notes.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,7 +1268,7 @@ Subtrees
12681268

12691269
Several parts of the repository are subtrees of software maintained elsewhere.
12701270

1271-
Some of these are maintained by active developers of Bitcoin Core, in which case
1271+
Normally, these are maintained by active developers of Bitcoin Core, in which case
12721272
changes should go directly upstream without being PRed directly against the project.
12731273
They will be merged back in the next subtree merge.
12741274

@@ -1280,32 +1280,20 @@ should be taken upstream.
12801280
There is a tool in `test/lint/git-subtree-check.sh` ([instructions](../test/lint#git-subtree-checksh))
12811281
to check a subtree directory for consistency with its upstream repository.
12821282

1283-
Current subtrees include:
1283+
The tool instructions also include a list of the subtrees managed by Bitcoin Core.
1284+
1285+
The ultimate upstream of the few externally managed subtrees are:
12841286

12851287
- src/leveldb
1286-
- Subtree at https://github.com/bitcoin-core/leveldb-subtree ; maintained by Core contributors.
12871288
- Upstream at https://github.com/google/leveldb ; maintained by Google. Open
1288-
important PRs to the subtree to avoid delay.
1289+
important PRs to the Bitcoin Core subtree to avoid delay.
12891290
- **Note**: Follow the instructions in [Upgrading LevelDB](#upgrading-leveldb) when
12901291
merging upstream changes to the LevelDB subtree.
12911292

12921293
- src/crc32c
12931294
- Used by leveldb for hardware acceleration of CRC32C checksums for data integrity.
1294-
- Subtree at https://github.com/bitcoin-core/crc32c-subtree ; maintained by Core contributors.
12951295
- Upstream at https://github.com/google/crc32c ; maintained by Google.
12961296

1297-
- src/secp256k1
1298-
- Upstream at https://github.com/bitcoin-core/secp256k1/ ; maintained by Core contributors.
1299-
1300-
- src/crypto/ctaes
1301-
- Upstream at https://github.com/bitcoin-core/ctaes ; maintained by Core contributors.
1302-
1303-
- src/minisketch
1304-
- Upstream at https://github.com/bitcoin-core/minisketch ; maintained by Core contributors.
1305-
1306-
- src/ipc/libmultiprocess
1307-
- Upstream at https://github.com/bitcoin-core/libmultiprocess ; maintained by Core contributors.
1308-
13091297
Upgrading LevelDB
13101298
---------------------
13111299

test/lint/README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,14 @@ Usage: test/lint/git-subtree-check.sh [-r] DIR [COMMIT]
9292

9393
To do a full check with `-r`, make sure that you have fetched the upstream repository branch in which the subtree is
9494
maintained:
95-
* for `src/secp256k1`: https://github.com/bitcoin-core/secp256k1.git (branch master)
96-
* for `src/leveldb`: https://github.com/bitcoin-core/leveldb-subtree.git (branch bitcoin-fork)
97-
* for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master)
9895
* for `src/crc32c`: https://github.com/bitcoin-core/crc32c-subtree.git (branch bitcoin-fork)
96+
* for `src/crypto/ctaes`: https://github.com/bitcoin-core/ctaes.git (branch master)
97+
* for `src/ipc/libmultiprocess`: https://github.com/bitcoin-core/libmultiprocess (branch master)
98+
* for `src/leveldb`: https://github.com/bitcoin-core/leveldb-subtree.git (branch bitcoin-fork)
9999
* for `src/minisketch`: https://github.com/bitcoin-core/minisketch.git (branch master)
100+
* for `src/secp256k1`: https://github.com/bitcoin-core/secp256k1.git (branch master)
101+
102+
Keep this list in sync with `fn get_subtrees()` in the lint runner.
100103

101104
To do so, add the upstream repository as remote:
102105

test/lint/test_runner/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,11 @@ fn commit_range() -> String {
205205

206206
/// Return all subtree paths
207207
fn get_subtrees() -> Vec<&'static str> {
208+
// Keep in sync with [test/lint/README.md#git-subtree-checksh]
208209
vec![
209210
"src/crc32c",
210211
"src/crypto/ctaes",
212+
"src/ipc/libmultiprocess",
211213
"src/leveldb",
212214
"src/minisketch",
213215
"src/secp256k1",

0 commit comments

Comments
 (0)