From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Feb 2016 22:16:08 +0000 (-0800)
Subject: Merge branch 'kf/http-proxy-auth-methods'
X-Git-Tag: v2.8.0-rc0~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30f302f7e7f407c0444b32e264aaa72c4081011e;p=git

Merge branch 'kf/http-proxy-auth-methods'

New http.proxyAuthMethod configuration variable can be used to
specify what authentication method to use, as a way to work around
proxies that do not give error response expected by libcurl when
CURLAUTH_ANY is used.  Also, the codepath for proxy authentication
has been taught to use credential API to store the authentication
material in user's keyrings.

* kf/http-proxy-auth-methods:
  http: use credential API to handle proxy authentication
  http: allow selection of proxy authentication method
---

30f302f7e7f407c0444b32e264aaa72c4081011e