summaryrefslogtreecommitdiffstats
path: root/git_command.py
diff options
context:
space:
mode:
authorShawn O. Pearce <sop@google.com>2012-06-13 10:40:46 -0700
committerShawn O. Pearce <sop@google.com>2012-06-13 10:42:16 -0700
commit337aee0a9c6714027ff4fa8659879b0710e2e6aa (patch)
tree59eeac1d718f560ee7341794206f068a98bc2427 /git_command.py
parent7cf1b36bcdc79c9239413e35b02dee54aa801a20 (diff)
downloadgit-repo-337aee0a9c6714027ff4fa8659879b0710e2e6aa.tar.gz
Single quote http.proxy in GIT_CONFIG_PARAMETERSv1.9.4
Git requires the values in this environment variable to be single quoted. repo must wrap the expression into '' before adding it to the environment. Change-Id: I20a1fb8772f9aa6e9fd5a0516c981c2ca020ef05
Diffstat (limited to 'git_command.py')
-rw-r--r--git_command.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/git_command.py b/git_command.py
index 634058f9..9bed799e 100644
--- a/git_command.py
+++ b/git_command.py
@@ -148,7 +148,7 @@ class GitCommand(object):
148 _setenv(env, 'REPO_SSH_SOCK', ssh_sock()) 148 _setenv(env, 'REPO_SSH_SOCK', ssh_sock())
149 _setenv(env, 'GIT_SSH', _ssh_proxy()) 149 _setenv(env, 'GIT_SSH', _ssh_proxy())
150 if 'http_proxy' in env and 'darwin' == sys.platform: 150 if 'http_proxy' in env and 'darwin' == sys.platform:
151 s = 'http.proxy=' + env['http_proxy'] 151 s = "'http.proxy=%s'" % (env['http_proxy'],)
152 p = env.get('GIT_CONFIG_PARAMETERS') 152 p = env.get('GIT_CONFIG_PARAMETERS')
153 if p is not None: 153 if p is not None:
154 s = p + ' ' + s 154 s = p + ' ' + s