[qa] univalue: Bump subtree #11952

pull MarcoFalke wants to merge 2 commits into bitcoin:master from MarcoFalke:Mf1712-univalueBump changing 2 files +2 −2
  1. MarcoFalke commented at 4:43 PM on December 19, 2017: member

    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.

  2. MarcoFalke added the label Tests on Dec 19, 2017
  3. MarcoFalke added the label Utils/log/libs on Dec 19, 2017
  4. jnewbery commented at 5:33 PM on December 19, 2017: member

    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
    
  5. ryanofsky commented at 8:37 PM on December 19, 2017: member

    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.

  6. MarcoFalke commented at 8:48 PM on December 19, 2017: member

    @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.

  7. ryanofsky commented at 9:11 PM on December 19, 2017: member

    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 unlike ec849d9a28 references the PR number containing the BOOST_CHECK_THROW change. If you look at ec849d9a28 by itself you have no clue where that change is coming from, where to find the code review comments etc. If you wanted to run a changelog script that would include PR numbers, the PR would never be mentioned.
    • 07947ff2da unlike ec849d9a28 is GPG signed.
    • 07947ff2da unlike ec849d9a28 includes Tree-SHA512 hash
    • 07947ff2da unlike ec849d9a28 has travis runs associated with it
    • 07947ff2da unlike ec849d9a28 doesn't require manual diffing in order to verify that it matches the current master branch of the https://github.com/bitcoin-core/univalue repository.
  8. Squashed 'src/univalue/' changes from fe805ea74f..07947ff2da
    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
    88411e98e5
  9. univalue: Bump subtree fad349c507
  10. MarcoFalke force-pushed on Dec 19, 2017
  11. MarcoFalke commented at 9:47 PM on December 19, 2017: member

    Changed commit. Tree shouldn't change, obviously.

  12. ryanofsky commented at 10:07 PM on December 19, 2017: member

    Thanks! utACK fad349c507a3179fa117ddf3ad6e651609c366cc, saw "GOOD" from git-subtree-check.sh

  13. laanwj commented at 3:51 PM on December 20, 2017: member

    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
    
  14. laanwj merged this on Dec 20, 2017
  15. laanwj closed this on Dec 20, 2017

  16. laanwj referenced this in commit 9ab9963386 on Dec 20, 2017
  17. MarcoFalke deleted the branch on Dec 20, 2017
  18. sickpig referenced this in commit c268e28adc on Jan 10, 2018
  19. protonn referenced this in commit 7b19426a9f on Mar 4, 2018
  20. PastaPastaPasta referenced this in commit 16f43e4cb4 on Jan 17, 2020
  21. PastaPastaPasta referenced this in commit 777bafa9ff on Jan 22, 2020
  22. PastaPastaPasta referenced this in commit 280e9eb0a4 on Jan 22, 2020
  23. PastaPastaPasta referenced this in commit 9a4ebf516e on Jan 29, 2020
  24. PastaPastaPasta referenced this in commit 5926cd50e0 on Jan 29, 2020
  25. PastaPastaPasta referenced this in commit 0a8230b1cc on Jan 29, 2020
  26. PastaPastaPasta referenced this in commit f4ed206352 on Jan 31, 2020
  27. ckti referenced this in commit a0be52777f on Mar 28, 2021
  28. DrahtBot locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-13 15:15 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me