summaryrefslogtreecommitdiff
path: root/t/lib-httpd.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-30 12:09:53 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-30 12:09:53 -0700
commit177f0a400955f2345c73a5c8b0459d617429ffd9 (patch)
treebefe6d8d3e767c1dc6bc06b3a8557d44a5faaefe /t/lib-httpd.sh
parent0d6cf2471f426dd2b742e2285aad78381738be96 (diff)
parent70900eda4a0ed473ab5a933940285ac3dda698c0 (diff)
downloadgit-177f0a400955f2345c73a5c8b0459d617429ffd9.tar.gz
Merge branch 'jk/http-auth-redirects'
Handle the case where http transport gets redirected during the authorization request better. * 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.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 54dbbfe5ce..ad8f1ef71e 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -204,7 +204,8 @@ set_askpass() {
}
expect_askpass() {
- dest=$HTTPD_DEST
+ dest=$HTTPD_DEST${3+/$3}
+
{
case "$1" in
none)