From 1a3259da85a43abdcb49f583f9bbbbe89c711240 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 5 Jun 2018 00:07:14 +0200 Subject: [PATCH] git: quote fake merge user to prevent this command to potentially fail --- rhodecode/lib/vcs/backends/git/repository.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/lib/vcs/backends/git/repository.py b/rhodecode/lib/vcs/backends/git/repository.py index c440b668..9957f17c 100644 --- 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)