# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-06-04 22:07:14
# Node ID dfa54fa91e6b578f500592c6a5c416971722b3ae
# Parent  f1cc2e3d51e6af2c7dedbe9f84f8c75fe726f2ee

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

diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py
--- a/rhodecode/lib/vcs/backends/git/repository.py
+++ b/rhodecode/lib/vcs/backends/git/repository.py
@@ -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)