summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-29 23:49:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-09-29 23:49:38 (GMT)
commit35ec7fd479f85797d3d2b76beee29121a0a45aff (patch)
tree5c96d1cd72e63e184629f6e1e9e4b8a560ede776 /http.c
parent8183592601b007c3eb92cc747276dbf30ef51a90 (diff)
parentd63ed6ef241b2e7f124089e2672cfce8251ed390 (diff)
downloadgit-35ec7fd479f85797d3d2b76beee29121a0a45aff.zip
git-35ec7fd479f85797d3d2b76beee29121a0a45aff.tar.gz
git-35ec7fd479f85797d3d2b76beee29121a0a45aff.tar.bz2
Merge branch 'jk/fix-remote-curl-url-wo-proto' into maint
"git fetch http::/site/path" did not die correctly and segfaulted instead. * jk/fix-remote-curl-url-wo-proto: remote-curl: handle URLs without protocol
Diffstat (limited to 'http.c')
-rw-r--r--http.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/http.c b/http.c
index cd40b01..edce47c 100644
--- a/http.c
+++ b/http.c
@@ -723,7 +723,7 @@ static CURL *get_curl_handle(void)
* precedence here, as in CURL.
*/
if (!curl_http_proxy) {
- if (!strcmp(http_auth.protocol, "https")) {
+ if (http_auth.protocol && !strcmp(http_auth.protocol, "https")) {
var_override(&curl_http_proxy, getenv("HTTPS_PROXY"));
var_override(&curl_http_proxy, getenv("https_proxy"));
} else {