summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-11-08 11:37:25 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-11-08 11:37:26 -0800
commite5becd042f821ac0a38077460a5fe816876a6504 (patch)
tree89523b0a33ee1700b7d2ecc5f421f441418732c2 /git-merge-octopus.sh
parentStart preparing for 1.8.4.3 (diff)
parenthttp.c: Spell the null pointer as NULL (diff)
downloadtgif-e5becd042f821ac0a38077460a5fe816876a6504.tar.xz
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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions