##// END OF EJS Templates
git: quote fake merge user to prevent this command to potentially fail
marcink -
r2778:dfa54fa9 default
parent child Browse files
Show More
@@ -834,7 +834,7 b' class GitRepository(BaseRepository):'
834
834
835 # N.B.(skreft): the --no-ff option is used to enforce the creation of a
835 # N.B.(skreft): the --no-ff option is used to enforce the creation of a
836 # commit message. We also specify the user who is doing the merge.
836 # commit message. We also specify the user who is doing the merge.
837 cmd = ['-c', 'user.name=%s' % safe_str(user_name),
837 cmd = ['-c', 'user.name="%s"' % safe_str(user_name),
838 '-c', 'user.email=%s' % safe_str(user_email),
838 '-c', 'user.email=%s' % safe_str(user_email),
839 'merge', '--no-ff', '-m', safe_str(merge_message)]
839 'merge', '--no-ff', '-m', safe_str(merge_message)]
840 cmd.extend(heads)
840 cmd.extend(heads)
General Comments 0
You need to be logged in to leave comments. Login now