diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-08 11:37:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-08 11:37:26 -0800 |
| commit | e5becd042f821ac0a38077460a5fe816876a6504 (patch) | |
| tree | 89523b0a33ee1700b7d2ecc5f421f441418732c2 /t/lib-httpd.sh | |
| parent | 486b65a4c3fe3a62e3793dba8c0c6e303b237fc9 (diff) | |
| parent | 70900eda4a0ed473ab5a933940285ac3dda698c0 (diff) | |
| download | git-e5becd042f821ac0a38077460a5fe816876a6504.tar.gz | |
Merge branch 'jk/http-auth-redirects' into maint
We did not handle cases where http transport gets redirected during
the authorization request (e.g. from http:// to https://).
* jk/http-auth-redirects:
http.c: Spell the null pointer as NULL
remote-curl: rewrite base url from info/refs redirects
remote-curl: store url as a strbuf
remote-curl: make refs_url a strbuf
http: update base URLs when we see redirects
http: provide effective url to callers
http: hoist credential request out of handle_curl_result
http: refactor options to http_get_*
http_request: factor out curlinfo_strbuf
http_get_file: style fixes
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 895b9258b0..7059cc6c21 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -187,7 +187,8 @@ set_askpass() { } expect_askpass() { - dest=$HTTPD_DEST + dest=$HTTPD_DEST${3+/$3} + { case "$1" in none) |