Merge branch 'sr/http-proxy-configuration-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 05:10:00 +0000 (22:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Apr 2017 05:10:00 +0000 (22:10 -0700)
commitd8f507e951ba34c3d08791f859baf7ef674ed894
tree760431e21fe422a38bc060bdb9f1eff0c288b793
parent79292aac69b6a4563ffbc4589a70ae46f7eb15cb
parentae51d91105981888f58ad21825b4ef0c540032e3
Merge branch 'sr/http-proxy-configuration-fix' into next

"http.proxy" set to an empty string is used to disable the usage of
proxy.  We broke this early last year.

* sr/http-proxy-configuration-fix:
  http: fix the silent ignoring of proxy misconfiguraion
  http: honor empty http.proxy option to bypass proxy
http.c