aboutsummaryrefslogtreecommitdiffstats
path: root/git-access.c
diff options
context:
space:
mode:
Diffstat (limited to 'git-access.c')
-rw-r--r--git-access.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-access.c b/git-access.c
index 9483234b0..076bdbae7 100644
--- a/git-access.c
+++ b/git-access.c
@@ -240,11 +240,14 @@ static git_repository *update_local_repo(const char *localdir, const char *remot
else
rt = OTHER;
+ git_repository_config(&conf, repo);
if (rt == HTTPS && getProxyString(&proxy_string)) {
- git_repository_config(&conf, repo);
git_config_set_string(conf, "http.proxy", proxy_string);
free(proxy_string);
+ } else {
+ git_config_set_string(conf, "http.proxy", "");
}
+
/*
* NOTE! Remote errors are reported, but are nonfatal:
* we still successfully return the local repository.