diff options
-rw-r--r-- | git_command.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git_command.py b/git_command.py index ea0053e3..634058f9 100644 --- a/git_command.py +++ b/git_command.py | |||
@@ -147,6 +147,12 @@ class GitCommand(object): | |||
147 | if ssh_proxy: | 147 | if ssh_proxy: |
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: | ||
151 | s = 'http.proxy=' + env['http_proxy'] | ||
152 | p = env.get('GIT_CONFIG_PARAMETERS') | ||
153 | if p is not None: | ||
154 | s = p + ' ' + s | ||
155 | _setenv(env, 'GIT_CONFIG_PARAMETERS', s) | ||
150 | 156 | ||
151 | if project: | 157 | if project: |
152 | if not cwd: | 158 | if not cwd: |
@@ -155,8 +161,6 @@ class GitCommand(object): | |||
155 | gitdir = project.gitdir | 161 | gitdir = project.gitdir |
156 | 162 | ||
157 | command = [GIT] | 163 | command = [GIT] |
158 | if 'http_proxy' in env and 'darwin' == sys.platform: | ||
159 | command.extend(['-c', 'http.proxy=' + env['http_proxy']]) | ||
160 | if bare: | 164 | if bare: |
161 | if gitdir: | 165 | if gitdir: |
162 | _setenv(env, GIT_DIR, gitdir) | 166 | _setenv(env, GIT_DIR, gitdir) |