Skip to content

Commit 1983c87

Browse files
committed
devtools: Retry after signing fails in github-merge
When signing fails, go back to the sign/exit prompt instead of exiting the script.
1 parent 5dd69ce commit 1983c87

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

contrib/devtools/github-merge.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,7 @@ def main():
301301
subprocess.check_call([GIT,'commit','-q','--gpg-sign','--amend','--no-edit'])
302302
break
303303
except subprocess.CalledProcessError as e:
304-
print("Error signing, exiting.",file=stderr)
305-
exit(1)
304+
print("Error while signing, asking again.",file=stderr)
306305
elif reply == 'x':
307306
print("Not signing off on merge, exiting.",file=stderr)
308307
exit(1)

0 commit comments

Comments
 (0)