From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Sep 2017 06:24:07 +0000 (+0900)
Subject: Merge branch 'nm/imap-send-with-curl'
X-Git-Tag: v2.15.0-rc0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b67f154bf972839cefc461cceb56abe3e6b12e27;p=thirdparty%2Fgit.git

Merge branch 'nm/imap-send-with-curl'

"git imap-send" has our own implementation of the protocol and also
can use more recent libCurl with the imap protocol support.  Update
the latter so that it can use the credential subsystem, and then
make it the default option to use, so that we can eventually
deprecate and remove the former.

* nm/imap-send-with-curl:
  imap-send: use curl by default when possible
  imap_send: setup_curl: retreive credentials if not set in config file
  imap-send: add wrapper to get server credentials if needed
  imap-send: return with error if curl failed
---

b67f154bf972839cefc461cceb56abe3e6b12e27