devtools: Make github-merge compute SHA512 from git, instead of worktree #9984

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2017_03_merge_hash_git changing 1 files +37 −8
  1. laanwj commented at 3:14 PM on March 13, 2017: member

    This changes tree_sha512sum() to requests the objects for hashing from git instead of from the working tree.

    The change should make the process more deterministic (it hashes what will be pushed) and hopefully avoids the frequent miscomputed SHA512's that happen now.

    As an added bonus this can now compute treehashes for non-HEAD commits, although this functionality is not used.

  2. devtools: Make github-merge compute SHA512 from git, instead of worktree
    This changes tree_sha512sum() to requests the objects for hashing from
    git instead of from the working tree.
    
    The change should make the process more deterministic (it hashes what
    will be pushed) and hopefully avoids the frequent miscomputed SHA512's
    that happen now.
    a327e8ea30
  3. laanwj added the label Scripts and tools on Mar 13, 2017
  4. MarcoFalke commented at 3:38 PM on March 13, 2017: member

    utACK a327e8ea30e10abdce910a3e37c78e00d0918548

    On Mon, Mar 13, 2017 at 4:15 PM, Wladimir J. van der Laan notifications@github.com wrote:

    This changes tree_sha512sum() to requests the objects for hashing from git instead of from the working tree.

    The change should make the process more deterministic (it hashes what will be pushed) and hopefully avoids the frequent miscomputed SHA512's that happen now.


    You can view, comment on, or merge this pull request online at:

    #9984

    Commit Summary

    devtools: Make github-merge compute SHA512 from git, instead of worktree

    File Changes

    M contrib/devtools/github-merge.py (45)

    Patch Links:

    #9984.patch #9984.diff

    — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or mute the thread.

  5. laanwj commented at 6:32 AM on March 14, 2017: member

    @MarcoFalke thanks I checked this against many recent merge commits and am now confident enough that this computes the same output as the old algorithm, to merge this.

  6. laanwj merged this on Mar 14, 2017
  7. laanwj closed this on Mar 14, 2017

  8. laanwj referenced this in commit cce056d729 on Mar 14, 2017
  9. PastaPastaPasta referenced this in commit 45784737ba on Jan 2, 2019
  10. PastaPastaPasta referenced this in commit 12d1dcd2da on Jan 2, 2019
  11. PastaPastaPasta referenced this in commit 47a07041dc on Jan 2, 2019
  12. PastaPastaPasta referenced this in commit dc9ad46f22 on Jan 3, 2019
  13. PastaPastaPasta referenced this in commit aa1f68e216 on Jan 21, 2019
  14. PastaPastaPasta referenced this in commit 4eb8e7029b on Jan 29, 2019
  15. PastaPastaPasta referenced this in commit e0046678a8 on Feb 26, 2019
  16. PastaPastaPasta referenced this in commit e8df27f8ee on Feb 26, 2019
  17. UdjinM6 referenced this in commit c06fc1512d on Mar 9, 2019
  18. PastaPastaPasta referenced this in commit 2df3acf2a2 on Mar 10, 2019
  19. MarcoFalke 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