From 7b7568b1ba536d37263dd8d2b395828ac0a2fd41 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 13 Jun 2015 09:13:08 -0700 Subject: [PATCH] Cloud storage: setup proxy before cloning new repository If we don't have a repository yet, we can't setup the proxy option before calling into libgit2. Instead we use a callback. Signed-off-by: Dirk Hohndel --- git-access.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/git-access.c b/git-access.c index 60e369bfb..061f8ec27 100644 --- a/git-access.c +++ b/git-access.c @@ -278,6 +278,21 @@ static git_repository *update_local_repo(const char *localdir, const char *remot return repo; } +static int repository_create_cb(git_repository **out, const char *path, int bare, void *payload) +{ + char *proxy_string; + git_config *conf; + + int ret = git_repository_init(out, path, bare); + + if (getProxyString(&proxy_string)) { + git_repository_config(&conf, *out); + git_config_set_string(conf, "http.proxy", proxy_string); + free(proxy_string); + } + return ret; +} + static git_repository *create_local_repo(const char *localdir, const char *remote, const char *branch, enum remote_transport rt) { int error; @@ -288,6 +303,7 @@ static git_repository *create_local_repo(const char *localdir, const char *remot opts.fetch_opts.callbacks.credentials = credential_ssh_cb; else if (strncmp(remote, "https://", 8) == 0) opts.fetch_opts.callbacks.credentials = credential_https_cb; + opts.repository_cb = repository_create_cb; #endif opts.checkout_branch = branch; if (rt == RT_HTTPS && !canReachCloudServer())