From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Apr 2017 05:07:44 +0000 (-0700)
Subject: Merge branch 'sr/http-proxy-configuration-fix'
X-Git-Tag: v2.13.0-rc1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b51cb61812c11915dbcc1d6daeee60ac77297de;p=thirdparty%2Fgit.git

Merge branch 'sr/http-proxy-configuration-fix'

"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
---

6b51cb61812c11915dbcc1d6daeee60ac77297de