Pulls in the test changes to the univalue subtree.
Beside looking at the code, reviewers should refer to https://github.com/bitcoin/bitcoin/blob/master/contrib/devtools/README.md#git-subtree-checksh on how to verify the subtree pull.
Pulls in the test changes to the univalue subtree.
Beside looking at the code, reviewers should refer to https://github.com/bitcoin/bitcoin/blob/master/contrib/devtools/README.md#git-subtree-checksh on how to verify the subtree pull.
Tested ACK fa58ff9c40632b00961abf9b09acee1bda1c5d3c. I've manually checked the commits, run the tests, and verified git-subtree-check:
./contrib/devtools/git-subtree-check.sh src/univalue
src/univalue in HEAD currently refers to tree 46076c3c05f8fb95a7bdad3f5c93d01f14ecbf9d
src/univalue in HEAD was last updated in commit 351fadd68a49e8955b1b0185da1eb90fa53a4cc6 (tree 46076c3c05f8fb95a7bdad3f5c93d01f14ecbf9d)
src/univalue in HEAD was last updated to upstream commit ec849d9a2889e89ba484dacbc7d2ce258f090545 (tree 46076c3c05f8fb95a7bdad3f5c93d01f14ecbf9d)
GOOD
NACK (I think) to fa58ff9c40632b00961abf9b09acee1bda1c5d3c, unless I am misunderstanding something. This seems to be using https://github.com/bitcoin-core/univalue/commits/ec849d9a2889e89ba484dacbc7d2ce258f090545 as the upstream commit, but that commit isn't a master commit on either https://github.com/bitcoin-core/univalue/commits/master or https://github.com/jgarzik/univalue/commits/master. I think if you switch to https://github.com/bitcoin-core/univalue/commit/07947ff2da9ef02a9dfa13346bc5545708e3ebe7 instead this should be good.
@ryanofsky It is a commit on the master branch for me. C.f.
$ git log univalue/master -3 --oneline && git log ec849d9a2889e89ba484dacbc7d2ce258f090545~ --oneline -1
07947ff2da (univalue/master) Merge [#9](/bitcoin-bitcoin/9/): [tests] Fix BOOST_CHECK_THROW macro
ec849d9a28 [tests] Fix BOOST_CHECK_THROW macro
31bc9f5a49 Merge [#8](/bitcoin-bitcoin/8/): Remove unused Homebrew workaround
31bc9f5a49 Merge [#8](/bitcoin-bitcoin/8/): Remove unused Homebrew workaround
So the 07947ff commit is an "empty" merge commit (artefact of the merge script to create commits even when fast-forward could have been used for the purpose of putting meta-information in there.) As we strip the meta information of commits for the purpose of subtree pulls, I fail to see the need to include it and redo the subtree pull.
That only shows ec849d9a28 is contained in the master branch. I wouldn't call it being on the on the master branch because the master branch has never pointed to that commit and never will. Would it be difficult to update this PR so it merges in the right commit (07947ff2da instead of ec849d9a28)?
It is true that there that there is no tree diff between 07947ff2da and ec849d9a28, but there are a few reasons why I think it is appropriate to update to 07947ff2da instead of ec849d9a28:
07947ff2da Merge #9: [tests] Fix BOOST_CHECK_THROW macro
ec849d9a28 [tests] Fix BOOST_CHECK_THROW macro
31bc9f5a49 Merge #8: Remove unused Homebrew workaround
fa042093d1 Remove HomeBrew workaround
a523e08ae4 Merge #7: Declare single-argument (non-converting) constructors "explicit"
a9e53b38ba Merge #4: Pull upstream
16a1f7f6e9 Merge #3: Pull upstream
daf1285af6 Merge pull request #2 from jgarzik/master
f32df99e96 Merge branch '2016_04_unicode' into bitcoin
280b191cb1 Merge remote-tracking branch 'jgarzik/master' into bitcoin
2740c4f712 Merge branch '2015_11_escape_plan' into bitcoin
git-subtree-dir: src/univalue
git-subtree-split: 07947ff2da9ef02a9dfa13346bc5545708e3ebe7
Changed commit. Tree shouldn't change, obviously.
Thanks! utACK fad349c507a3179fa117ddf3ad6e651609c366cc, saw "GOOD" from git-subtree-check.sh
utACK fad349c
src/univalue in HEAD currently refers to tree 46076c3c05f8fb95a7bdad3f5c93d01f14ecbf9d
src/univalue in HEAD was last updated in commit 88411e98e50c92f8990733eee0bc353ac8f21a35 (tree 46076c3c05f8fb95a7bdad3f5c93d01f14ecbf9d)
src/univalue in HEAD was last updated to upstream commit 07947ff2da9ef02a9dfa13346bc5545708e3ebe7 (tree 46076c3c05f8fb95a7bdad3f5c93d01f14ecbf9d)
GOOD