Skip to content

Conversation

@laanwj
Copy link
Member

@laanwj laanwj commented Mar 13, 2017

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.

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.
@maflcko
Copy link
Member

maflcko commented Mar 13, 2017 via email

@laanwj
Copy link
Member Author

laanwj commented Mar 14, 2017

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

@laanwj laanwj merged commit a327e8e into bitcoin:master Mar 14, 2017
laanwj added a commit that referenced this pull request Mar 14, 2017
…tead of worktree

a327e8e devtools: Make github-merge compute SHA512 from git, instead of worktree (Wladimir J. van der Laan)

Tree-SHA512: 22ec7712876be4ab361015a2dd75a09628ec59105ffe3260126f899d8f3ff8666351b65b9a4dfe83f78eb777730442cd0352b155d7f573424f7fc1c4dbc0ddd2
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Feb 26, 2019
…it, instead of worktree

a327e8e devtools: Make github-merge compute SHA512 from git, instead of worktree (Wladimir J. van der Laan)

Tree-SHA512: 22ec7712876be4ab361015a2dd75a09628ec59105ffe3260126f899d8f3ff8666351b65b9a4dfe83f78eb777730442cd0352b155d7f573424f7fc1c4dbc0ddd2
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants