phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 03:03:22 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

verify-commits: Use merge-tree in clean merge check

Browse source
This commit is contained in:
Andrew Chow 2023-02-07 13:46:56 -05:00
parent 76923bfa09
commit 5497c14830
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
contrib/verify-commits/verify-commits.py
View file

@ -95,7 +95,7 @@ def main():
with open(dirname + "/trusted-keys", "r", encoding="utf8") as f: with open(dirname + "/trusted-keys", "r", encoding="utf8") as f:
trusted_keys = f.read().splitlines() trusted_keys = f.read().splitlines()
# Set commit and branch and set variables # Set commit and variables
current_commit = args.commit current_commit = args.commit
if ' ' in current_commit: if ' ' in current_commit:
print("Commit must not contain spaces", file=sys.stderr) print("Commit must not contain spaces", file=sys.stderr)
@ -104,7 +104,6 @@ def main():
no_sha1 = True no_sha1 = True
prev_commit = "" prev_commit = ""
initial_commit = current_commit initial_commit = current_commit
branch = subprocess.check_output([GIT, 'show', '-s', '--format=%H', initial_commit]).decode('utf8').splitlines()[0]
# Iterate through commits # Iterate through commits
while True: while True:
@ -164,15 +163,11 @@ def main():
allow_unclean = current_commit in unclean_merge_allowed allow_unclean = current_commit in unclean_merge_allowed
if len(parents) == 2 and check_merge and not allow_unclean: if len(parents) == 2 and check_merge and not allow_unclean:
current_tree = subprocess.check_output([GIT, 'show', '--format=%T', current_commit]).decode('utf8').splitlines()[0] current_tree = subprocess.check_output([GIT, 'show', '--format=%T', current_commit]).decode('utf8').splitlines()[0]
subprocess.call([GIT, 'checkout', '--force', '--quiet', parents[0]]) recreated_tree = subprocess.check_output([GIT, "merge-tree", parents[0], parents[1]]).decode('utf8').splitlines()[0]
subprocess.call([GIT, 'merge', '--no-ff', '--quiet', '--no-gpg-sign', parents[1]], stdout=subprocess.DEVNULL)
recreated_tree = subprocess.check_output([GIT, 'show', '--format=format:%T', 'HEAD']).decode('utf8').splitlines()[0]
if current_tree != recreated_tree: if current_tree != recreated_tree:
print("Merge commit {} is not clean".format(current_commit), file=sys.stderr) print("Merge commit {} is not clean".format(current_commit), file=sys.stderr)
subprocess.call([GIT, 'diff', current_commit]) subprocess.call([GIT, 'diff', recreated_tree, current_tree])
subprocess.call([GIT, 'checkout', '--force', '--quiet', branch])
sys.exit(1) sys.exit(1)
subprocess.call([GIT, 'checkout', '--force', '--quiet', branch])
prev_commit = current_commit prev_commit = current_commit
current_commit = parents[0] current_commit = parents[0]