The subtree-merge commit also fixes the whitespace for failing tests, such that bisect doesn’t break.
Finally, the bump also includes the changes that accidentally modified our subtree, such that the subtree check should work fine now:
0./contrib/devtools/git-subtree-check.sh src/univalue
fe805ea74 Declare single-argument (non-converting) constructors "explicit"
8a2d6f1e3 Merge pull request #41 from jgarzik/get-obj-map
ba341a20d Add getObjMap() helper method. Also, constify checkObject().
ceb119413 Handle .pushKV() and .checkObject() edge cases.
107db9829 Add ::push_back(double) method for feature parity.
d41530031 Move one-line implementation of UniValue::read() to header.
52e85b35b Move exception-throwing get_* methods into separate implementation module.
dac529675 README.md: update code quotes
3e31dcffb README.md: close code quote
d09b8429d Update README.md
f1b86edb4 Convert README to markdown style.
1dfe464ef Import UniValue class unit tests from bitcoin project.
0d3e74dd1 operator[] takes size_t index parameter (versus unsigned int)
640158fa2 Private findKey() method becomes size_t clean, and returns bool on failure.
709913585 Merge pull request #36 from ryanofsky/pr/end-str
a31231b51 Version 1.0.3
4fd5444d1 Reject unterminated strings
81eba332b Merge pull request #26 from isle2983/pushBackHelpers
36405413e Merge PR #32 from branch 'nul-not-special' of git://github.com/ryanofsky/univalue into merge
89bb07322 Merge pull request #31 from ryanofsky/raw-literals
511008c36 Merge pull request #30 from ryanofsky/test-driver
77974f3a9 Merge pull request #34 from paveljanik/20161116_Wshadow_codepoint
a38fcd355 Do not shadow member variable codepoint.
fd32d1ab8 Don't require nul-terminated string inputs
0bb1439d0 Support parsing raw literals in UniValue
28876d045 Merge pull request #29 from btcdrak/exportspace
839ccd71f Add test driver for JSONTestSuite
26ef3fff1 Remove trailing whitespace from JSON export
cfa0384d6 Convenience wrappers for push_back-ing integer types
REVERT: 16a1f7f6e Merge #3: Pull upstream
REVERT: daf1285af Merge pull request #2 from jgarzik/master
REVERT: f32df99e9 Merge branch '2016_04_unicode' into bitcoin
REVERT: 280b191cb Merge remote-tracking branch 'jgarzik/master' into bitcoin
REVERT: 2740c4f71 Merge branch '2015_11_escape_plan' into bitcoin
git-subtree-dir: src/univalue
git-subtree-split: fe805ea74f8919382720b09a905a14e81311b3ad
This merge commit bumps the univalue subtree and also updates the whitespace
for some failing tests.
utACK faaeeb0
The whitespace fix is a nice little improvement.
tested ACK faaeeb0
0[pull/11420/local-merge f94cd2237] Merge [#11420](/bitcoin-bitcoin/11420/): Bump univalue subtree and fix json formatting in tests
1 Date: Wed Oct 11 19:13:16 2017 +0800
2[#11420](/bitcoin-bitcoin/11420/) Bump univalue subtree and fix json formatting in tests into master
3* faaeeb0d3 Bump univalue and fix json formatting in tests (MarcoFalke) (pull/11420/head)
4* 619bb0503 Squashed 'src/univalue/' changes from 16a1f7f6e..fe805ea74 (MarcoFalke)
5
6Dropping you on a shell so you can try building/testing the merged source.
7Run 'git diff HEAD~' to show the changes being merged.
8Type 'exit' when done.
9bash-3.2$ git fetch https://github.com/bitcoin-core/univalue.git
10warning: no common commits
11remote: Counting objects: 565, done.
12remote: Compressing objects: 100% (7/7), done.
13remote: Total 565 (delta 0), reused 4 (delta 0), pack-reused 558
14Receiving objects: 100% (565/565), 111.21 KiB | 77.00 KiB/s, done.
15Resolving deltas: 100% (304/304), done.
16From https://github.com/bitcoin-core/univalue
17 * branch HEAD -> FETCH_HEAD
18bash-3.2$ ./contrib/devtools/git-subtree-check.sh src/univalue
19src/univalue in HEAD was last updated to upstream commit fe805ea74f8919382720b09a905a14e81311b3ad (tree 5d48005ff778ddf521705b5d08d19189966fc36b)
20src/univalue in HEAD currently refers to tree 5d48005ff778ddf521705b5d08d19189966fc36b
21GOOD
0/Applications/Xcode.app/Contents/Developer/usr/bin/make check-TESTS check-local
1Running test/util/bitcoin-util-test.py...
2/usr/local/bin/python3.6 ../test/util/bitcoin-util-test.py
3 CC src/tests-tests.o
4 CC src/exhaustive_tests-tests_exhaustive.o
5make[5]: `libsecp256k1.la' is up to date.
6 CCLD exhaustive_tests
7PASS: qt/test/test_bitcoin-qt
8 CCLD tests
9/Applications/Xcode.app/Contents/Developer/usr/bin/make check-TESTS
10PASS: exhaustive_tests
11PASS: tests
12============================================================================
13Testsuite summary for libsecp256k1 0.1
14============================================================================
15# TOTAL: 2
16# PASS: 2
17# SKIP: 0
18# XFAIL: 0
19# FAIL: 0
20# XPASS: 0
21# ERROR: 0
22============================================================================
23 CXX test/test_object-object.o
24 CXX test/test_test_json-test_json.o
25 CXX test/test_unitester-unitester.o
26 CXX test/test_no_nul-no_nul.o
27 CXXLD test/no_nul
28 CXXLD test/test_json
29 CXXLD test/unitester
30 CXXLD test/object
31/Applications/Xcode.app/Contents/Developer/usr/bin/make check-TESTS
32PASS: test/no_nul
33PASS: test/object
34PASS: test/unitester
35============================================================================
36Testsuite summary for univalue 1.0.3
37============================================================================
38# TOTAL: 3
39# PASS: 3
40# SKIP: 0
41# XFAIL: 0
42# FAIL: 0
43# XPASS: 0
44# ERROR: 0
45============================================================================
46PASS: test/test_bitcoin
47============================================================================
48Testsuite summary for Bitcoin Core 0.15.99
49============================================================================
50# TOTAL: 2
51# PASS: 2
52# SKIP: 0
53# XFAIL: 0
54# FAIL: 0
55# XPASS: 0
56# ERROR: 0
57============================================================================
58Making check in doc/man
59make[1]: Nothing to be done for `check'.
60make[1]: Nothing to be done for `check-am'.