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

dashpay · Mar 3, 2017 · fa7da3f · fa7da3f
1 parent 65d90f5
commit fa7da3f
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
@@ -212,10 +212,6 @@ def main():
         except subprocess.CalledProcessError as e:
             printf("ERROR: Cannot update message.",file=stderr)
             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))
         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)
                 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.
         reply = ask_prompt("Type 's' to sign off on the merge.")
         if reply == 's':