mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
35ec7fd479
2
http.c
2
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 {
|
||||
|
|
|
@ -299,5 +299,13 @@ test_expect_success 'git client does not send an empty Accept-Language' '
|
|||
! grep "^=> Send header: Accept-Language:" stderr
|
||||
'
|
||||
|
||||
test_expect_success 'remote-http complains cleanly about malformed urls' '
|
||||
# do not actually issue "list" or other commands, as we do not
|
||||
# want to rely on what curl would actually do with such a broken
|
||||
# URL. This is just about making sure we do not segfault during
|
||||
# initialization.
|
||||
test_must_fail git remote-http http::/example.com/repo.git
|
||||
'
|
||||
|
||||
stop_httpd
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue