aboutsummaryrefslogtreecommitdiff
path: root/contrib/verify-commits/verify-commits.py
diff options
context:
space:
mode:
authorJameson Lopp <jameson.lopp@gmail.com>2018-11-26 10:22:36 -0500
committerJameson Lopp <jameson.lopp@gmail.com>2018-12-06 10:41:08 -0500
commit45842c3d26098ad6d12f5cb96bbcf9bcde650950 (patch)
tree9803b0606d8c879f5b20a6a79b2a0c714feb4f07 /contrib/verify-commits/verify-commits.py
parent327129f7a6440e3bbd0a0ea415ea5f8907cf3233 (diff)
Improve documentation for running verify-commits.py script
Diffstat (limited to 'contrib/verify-commits/verify-commits.py')
-rwxr-xr-xcontrib/verify-commits/verify-commits.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/verify-commits/verify-commits.py b/contrib/verify-commits/verify-commits.py
index 544f4dc48d..b3c8064ec2 100755
--- a/contrib/verify-commits/verify-commits.py
+++ b/contrib/verify-commits/verify-commits.py
@@ -139,7 +139,7 @@ def main():
if len(parents) == 2 and check_merge and not allow_unclean:
current_tree = subprocess.check_output([GIT, 'show', '--format=%T', current_commit], universal_newlines=True, encoding='utf8').splitlines()[0]
subprocess.call([GIT, 'checkout', '--force', '--quiet', parents[0]])
- subprocess.call([GIT, 'merge', '--no-ff', '--quiet', parents[1]], stdout=subprocess.DEVNULL)
+ 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'], universal_newlines=True, encoding='utf8').splitlines()[0]
if current_tree != recreated_tree:
print("Merge commit {} is not clean".format(current_commit), file=sys.stderr)