LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

[contrib] gh-merge: Move second sha512 check to before signing

Browse source
This commit is contained in:
MarcoFalke 2017-03-02 23:05:29 +01:00
parent 65d90f585a
commit fa7da3fd96
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/devtools/github-merge.py
View file

@ -212,10 +212,6 @@ def main():
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
printf("ERROR: Cannot update message.",file=stderr) printf("ERROR: Cannot update message.",file=stderr)
exit(4) exit(4)
second_sha512 = tree_sha512sum()
if first_sha512 != second_sha512:
print("ERROR: Tree hash changed unexpectedly",file=stderr)
exit(4)
print('%s#%s%s %s %sinto %s%s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title,ATTR_RESET+ATTR_PR,branch,ATTR_RESET)) print('%s#%s%s %s %sinto %s%s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title,ATTR_RESET+ATTR_PR,branch,ATTR_RESET))
subprocess.check_call([GIT,'log','--graph','--topo-order','--pretty=format:'+COMMIT_FORMAT,base_branch+'..'+head_branch]) subprocess.check_call([GIT,'log','--graph','--topo-order','--pretty=format:'+COMMIT_FORMAT,base_branch+'..'+head_branch])
@ -258,6 +254,11 @@ def main():
print("ERROR: Merge rejected.",file=stderr) print("ERROR: Merge rejected.",file=stderr)
exit(7) exit(7)
second_sha512 = tree_sha512sum()
if first_sha512 != second_sha512:
print("ERROR: Tree hash changed unexpectedly",file=stderr)
exit(8)
# Sign the merge commit. # Sign the merge commit.
reply = ask_prompt("Type 's' to sign off on the merge.") reply = ask_prompt("Type 's' to sign off on the merge.")
if reply == 's': if reply == 's':