Skip to content

Commit 05df58e

Browse files
author
MarcoFalke
committed
github-merge: Set git user name to merge-script
1 parent 7efae0b commit 05df58e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

github-merge.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,8 @@ def main():
444444
reply = ask_prompt("Type 's' to sign off on the above merge, or 'x' to reject and exit.").lower()
445445
if reply == 's':
446446
try:
447-
subprocess.check_call([GIT,'commit','-q','--gpg-sign','--amend','--no-edit'])
447+
config = ['-c', 'user.name=merge-script']
448+
subprocess.check_call([GIT] + config + ['commit','-q','--gpg-sign','--amend','--no-edit','--reset-author'])
448449
break
449450
except subprocess.CalledProcessError:
450451
print("Error while signing, asking again.",file=stderr)

0 commit comments

Comments
 (0)