]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/http-auth-redirects' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 8 Nov 2013 19:37:25 +0000 (11:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 8 Nov 2013 19:37:26 +0000 (11:37 -0800)
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

1  2 
http-push.c

diff --cc http-push.c
Simple merge