engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

git: quote fake merge user to prevent this command to potentially fail

Browse source
This commit is contained in:
Marcin Kuzminski 2018-06-05 00:07:14 +02:00
parent ede517c6b1
commit 1a3259da85
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/lib/vcs/backends/git/repository.py
View file

@ -834,7 +834,7 @@ class GitRepository(BaseRepository):
# N.B.(skreft): the --no-ff option is used to enforce the creation of a
# commit message. We also specify the user who is doing the merge.
cmd = ['-c', 'user.name=%s' % safe_str(user_name),
cmd = ['-c', 'user.name="%s"' % safe_str(user_name),
'-c', 'user.email=%s' % safe_str(user_email),
'merge', '--no-ff', '-m', safe_str(merge_message)]
cmd.extend(heads)