[contrib] gh-merge: Move second sha512 check to the end #9905

pull MarcoFalke wants to merge 1 commits into bitcoin:master from MarcoFalke:Mf1703-gh-merge changing 1 files +5 −4

MarcoFalke commented at 10:08 PM on March 2, 2017: member

This moves the check down, so it is run after the signature was created. Otherwise it seems to me that this would not do anything.
MarcoFalke added the label Scripts and tools on Mar 2, 2017
MarcoFalke renamed this:
~~contrib: Move second sha512 check to the end~~
[contrib] gh-merge: Move second sha512 check to the end
on Mar 2, 2017
sipa commented at 10:10 PM on March 2, 2017: member

utACK
laanwj commented at 2:06 PM on March 3, 2017: member

Otherwise it seems to me that this would not do anything.

~~It does work, as you're not supposed to change the tree during your validation session.~~

I misunderstood, you're moving the second check to after the GPG signing. Ok, yes, I guess that makes sense. Going to test.
[contrib] gh-merge: Move second sha512 check to before signing fa7da3fd96
in contrib/devtools/github-merge.py:None in fa1b11c267 outdated
```
 265 | @@ -270,6 +266,11 @@ def main():
 266 |              print("Not signing off on merge, exiting.",file=stderr)
 267 |              exit(1)
 268 |  
 269 | +        second_sha512 = tree_sha512sum()
```
laanwj commented at 2:11 PM on March 3, 2017:

I'd somewhat prefer to do this check

after confirming signing off on the merge

but before putting the actual GPG signature

This avoids having a signed commit around (even though it's throwing it away) from something that isn't supposed to be.
MarcoFalke commented at 2:17 PM on March 3, 2017:

done
MarcoFalke force-pushed on Mar 3, 2017
laanwj merged this on Mar 5, 2017
laanwj closed this on Mar 5, 2017
laanwj referenced this in commit 01b7cda916 on Mar 5, 2017
MarcoFalke deleted the branch on Mar 5, 2017
PastaPastaPasta referenced this in commit 76b6107a0e on Dec 30, 2018
PastaPastaPasta referenced this in commit 9e37023e7d on Dec 31, 2018
PastaPastaPasta referenced this in commit 5f06a69357 on Dec 31, 2018
PastaPastaPasta referenced this in commit e95042ac57 on Dec 31, 2018
PastaPastaPasta referenced this in commit fa07cb2b1f on Jan 2, 2019
PastaPastaPasta referenced this in commit 3d232583d7 on Jan 2, 2019
PastaPastaPasta referenced this in commit a97314b931 on Jan 3, 2019
PastaPastaPasta referenced this in commit c16dfea2b2 on Jan 21, 2019
PastaPastaPasta referenced this in commit b8541b7afa on Jan 25, 2019
PastaPastaPasta referenced this in commit 40580b995c on Jan 29, 2019
PastaPastaPasta referenced this in commit bbf89574b4 on Jan 29, 2019
PastaPastaPasta referenced this in commit e63543ca40 on Jan 29, 2019
PastaPastaPasta referenced this in commit 6edf17ee9d on Feb 1, 2019
PastaPastaPasta referenced this in commit f1db158715 on Feb 1, 2019
PastaPastaPasta referenced this in commit fdfe02e3d2 on Feb 1, 2019
PastaPastaPasta referenced this in commit be573a1a09 on Feb 1, 2019
PastaPastaPasta referenced this in commit 8944b5a784 on Feb 1, 2019
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels