diff options
| -rw-r--r-- | git-access.c | 22 | ||||
| -rw-r--r-- | qthelper.cpp | 17 |
2 files changed, 33 insertions, 6 deletions
diff --git a/git-access.c b/git-access.c index b6f60a1f4..9483234b0 100644 --- a/git-access.c +++ b/git-access.c @@ -215,12 +215,17 @@ static int check_remote_status(git_repository *repo, git_remote *origin, const c git_reference_free(remote_ref); } +/* from qthelper.cpp */ +extern bool getProxyString(char **proxy_string); + static git_repository *update_local_repo(const char *localdir, const char *remote, const char *branch) { int error; git_repository *repo = NULL; git_remote *origin; enum remote_type rt; + char *proxy_string; + git_config *conf; error = git_repository_open(&repo, localdir); if (error) { @@ -228,7 +233,18 @@ static git_repository *update_local_repo(const char *localdir, const char *remot localdir, giterr_last()->message); return NULL; } + if (strncmp(remote, "ssh://", 6) == 0) + rt = SSH; + else if (strncmp(remote, "https://", 8) == 0) + rt = HTTPS; + else + rt = OTHER; + if (rt == HTTPS && getProxyString(&proxy_string)) { + git_repository_config(&conf, repo); + git_config_set_string(conf, "http.proxy", proxy_string); + free(proxy_string); + } /* * NOTE! Remote errors are reported, but are nonfatal: * we still successfully return the local repository. @@ -240,12 +256,6 @@ static git_repository *update_local_repo(const char *localdir, const char *remot return repo; } - if (strncmp(remote, "ssh://", 6) == 0) - rt = SSH; - else if (strncmp(remote, "https://", 8) == 0) - rt = HTTPS; - else - rt = OTHER; #if USE_LIBGIT23_API git_fetch_options opts = GIT_FETCH_OPTIONS_INIT; if (rt == SSH) diff --git a/qthelper.cpp b/qthelper.cpp index fb688746e..f918cfa72 100644 --- a/qthelper.cpp +++ b/qthelper.cpp @@ -24,6 +24,7 @@ #include <QNetworkReply> #include <QNetworkRequest> #include <QNetworkAccessManager> +#include <QNetworkProxy> #include <QUrlQuery> #include <QEventLoop> #include <QDateTime> @@ -1034,3 +1035,19 @@ int getCloudURL(QString &filename) filename = QString("https://cloud.subsurface-divelog.org/git/%1[%1]").arg(email); return 0; } + +extern "C" bool getProxyString(char **buffer) +{ + if (prefs.proxy_type == QNetworkProxy::HttpProxy) { + QString proxy; + if (prefs.proxy_auth) + proxy = QString("http://%1:%2@%3:%4").arg(prefs.proxy_user).arg(prefs.proxy_pass) + .arg(prefs.proxy_host).arg(prefs.proxy_port); + else + proxy = QString("http://%1:%2").arg(prefs.proxy_host).arg(prefs.proxy_port); + if (buffer) + *buffer = strdup(qPrintable(proxy)); + return true; + } + return false; +} |