Don't GPG sign intermediate commits with github-merge tool

pull/16130/head
Steven Roose 6 years ago
parent c7cfd20a77
commit a352d2ae5f
No known key found for this signature in database
GPG Key ID: 2F2A88D7F8D68E87

@ -283,7 +283,7 @@ def main():
message += '\n\nPull request description:\n\n ' + body.replace('\n', '\n ') + '\n' message += '\n\nPull request description:\n\n ' + body.replace('\n', '\n ') + '\n'
message += get_acks_from_comments(head_commit=subprocess.check_output([GIT,'log','-1','--pretty=format:%H',head_branch]).decode('utf-8')[:6], comments=comments) message += get_acks_from_comments(head_commit=subprocess.check_output([GIT,'log','-1','--pretty=format:%H',head_branch]).decode('utf-8')[:6], comments=comments)
try: try:
subprocess.check_call([GIT,'merge','-q','--commit','--no-edit','--no-ff','-m',message.encode('utf-8'),head_branch]) subprocess.check_call([GIT,'merge','-q','--commit','--no-edit','--no-ff','--no-gpg-sign','-m',message.encode('utf-8'),head_branch])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print("ERROR: Cannot be merged cleanly.",file=stderr) print("ERROR: Cannot be merged cleanly.",file=stderr)
subprocess.check_call([GIT,'merge','--abort']) subprocess.check_call([GIT,'merge','--abort'])
@ -307,7 +307,7 @@ def main():
print("ERROR: Unable to compute tree hash") print("ERROR: Unable to compute tree hash")
sys.exit(4) sys.exit(4)
try: try:
subprocess.check_call([GIT,'commit','--amend','-m',message.encode('utf-8')]) subprocess.check_call([GIT,'commit','--amend','--no-gpg-sign','-m',message.encode('utf-8')])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print("ERROR: Cannot update message.", file=stderr) print("ERROR: Cannot update message.", file=stderr)
sys.exit(4) sys.exit(4)

Loading…
Cancel
Save