diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 18:23:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 18:23:23 (GMT) |
| commit | 84a37fae516eff3072a5729ce0ce40bf056fbeb1 (patch) | |
| tree | 83ca6618068a165f29bbd7392c962935eac156e2 | |
| parent | 82b6e331a4f07b6e0080f7d18b4189d53190a04e (diff) | |
| parent | dcd01ea187fc9a936b4083a85343989840afd7bd (diff) | |
| download | git-84a37fae516eff3072a5729ce0ce40bf056fbeb1.zip git-84a37fae516eff3072a5729ce0ce40bf056fbeb1.tar.gz git-84a37fae516eff3072a5729ce0ce40bf056fbeb1.tar.bz2 | |
Merge branch 'km/imap-send-libcurl-options' into maint
"git imap-send" learned to optionally talk with an IMAP server via
libcURL; because there is no other option when Git is built with
NO_OPENSSL option, use that codepath by default under such
configuration.
* km/imap-send-libcurl-options:
imap-send: use cURL automatically when NO_OPENSSL defined
| -rw-r--r-- | Documentation/git-imap-send.txt | 3 | ||||
| -rw-r--r-- | imap-send.c | 17 |
2 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt index 77aacf1..5d1e4c8 100644 --- a/Documentation/git-imap-send.txt +++ b/Documentation/git-imap-send.txt @@ -44,7 +44,8 @@ OPTIONS --no-curl:: Talk to the IMAP server using git's own IMAP routines instead of - using libcurl. + using libcurl. Ignored if Git was built with the NO_OPENSSL option + set. CONFIGURATION diff --git a/imap-send.c b/imap-send.c index d69887d..37ac4aa 100644 --- a/imap-send.c +++ b/imap-send.c @@ -34,8 +34,16 @@ typedef void *SSL; #include "http.h" #endif +#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL) +/* only available option */ +#define USE_CURL_DEFAULT 1 +#else +/* strictly opt in */ +#define USE_CURL_DEFAULT 0 +#endif + static int verbosity; -static int use_curl; /* strictly opt in */ +static int use_curl = USE_CURL_DEFAULT; static const char * const imap_send_usage[] = { "git imap-send [-v] [-q] [--[no-]curl] < <mbox>", NULL }; @@ -1504,9 +1512,14 @@ int main(int argc, char **argv) #ifndef USE_CURL_FOR_IMAP_SEND if (use_curl) { - warning("--use-curl not supported in this build"); + warning("--curl not supported in this build"); use_curl = 0; } +#elif defined(NO_OPENSSL) + if (!use_curl) { + warning("--no-curl not supported in this build"); + use_curl = 1; + } #endif if (!server.port) |