From: Junio C Hamano <gitster@pobox.com>
To: Git List <git@vger.kernel.org>
Cc: Eric Sunshine <sunshine@sunshineco.com>, github@brendanforster.com
Subject: [PATCH] http: give curl version warnings consistently
Date: Thu, 25 Oct 2018 12:29:19 +0900 [thread overview]
Message-ID: <xmqqsh0uln5c.fsf_-_@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqzhv2lnn6.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Thu, 25 Oct 2018 12:18:37 +0900")
When a requested feature cannot be activated because the version of
cURL library used to build Git with is too old, most of the codepaths
give a warning like "$Feature is not supported with cURL < $Version",
marked for l10n. A few of them, however, did not follow that pattern
and said things like "$Feature is not activated, your curl version is
too old (>= $Version)", and without marking them for l10n.
Update these to match the style of the majority of warnings and mark
them for l10n.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
> I have a clean-up suggestion related to this but is orthogonal to
> this three-patch series (after the fix-up is applied, anyway), which
> I'll be sending out separately.
So, here it is.
http.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/http.c b/http.c
index 43e75ac583..2214100e3b 100644
--- a/http.c
+++ b/http.c
@@ -834,8 +834,7 @@ static CURL *get_curl_handle(void)
#if LIBCURL_VERSION_NUM >= 0x072c00
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
#else
- warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n"
- "your curl version is too old (< 7.44.0)");
+ warning(_("CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"));
#endif
}
@@ -908,8 +907,7 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_PROTOCOLS,
get_curl_allowed_protocols(-1));
#else
- warning("protocol restrictions not applied to curl redirects because\n"
- "your curl version is too old (>= 7.19.4)");
+ warning(_("Protocol restrictions not supported with cURL < 7.19.4"));
#endif
if (getenv("GIT_CURL_VERBOSE"))
curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);
--
2.19.1-542-gc4df23f792
next prev parent reply other threads:[~2018-10-25 3:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 10:14 [PATCH 0/3] Allow choosing the SSL backend cURL uses (plus related patches) Johannes Schindelin via GitGitGadget
2018-10-15 10:14 ` [PATCH 1/3] http: add support for selecting SSL backends at runtime Johannes Schindelin via GitGitGadget
2018-10-15 14:06 ` Eric Sunshine
2018-10-15 10:14 ` [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL Brendan Forster via GitGitGadget
2018-10-15 14:10 ` Eric Sunshine
2018-10-16 12:21 ` Johannes Schindelin
2018-10-25 3:18 ` Junio C Hamano
2018-10-25 3:29 ` Junio C Hamano [this message]
2018-10-25 6:23 ` [PATCH] http: give curl version warnings consistently Jeff King
2018-10-25 19:00 ` Johannes Schindelin
2018-10-26 4:39 ` Junio C Hamano
2018-10-25 12:12 ` [PATCH 2/3] http: add support for disabling SSL revocation checks in cURL Johannes Schindelin
2018-10-16 4:23 ` Junio C Hamano
2018-10-16 6:33 ` Jeff King
2018-10-16 12:25 ` Johannes Schindelin
2018-10-16 15:28 ` Jeff King
2018-10-16 12:22 ` Johannes Schindelin
2018-10-18 1:53 ` Junio C Hamano
2018-10-25 18:52 ` Johannes Schindelin
2018-10-26 4:41 ` Junio C Hamano
2018-10-15 10:14 ` [PATCH 3/3] http: when using Secure Channel, ignore sslCAInfo by default Johannes Schindelin via GitGitGadget
2018-10-25 18:53 ` [PATCH v2 0/3] Allow choosing the SSL backend cURL uses (plus related patches) Johannes Schindelin via GitGitGadget
2018-10-25 18:53 ` [PATCH v2 1/3] http: add support for selecting SSL backends at runtime Johannes Schindelin via GitGitGadget
2018-12-13 9:33 ` Ævar Arnfjörð Bjarmason
2018-12-13 13:08 ` Johannes Schindelin
2018-12-13 13:15 ` Johannes Schindelin
2018-10-25 18:53 ` [PATCH v2 2/3] http: add support for disabling SSL revocation checks in cURL Brendan Forster via GitGitGadget
2018-10-25 18:53 ` [PATCH v2 3/3] http: when using Secure Channel, ignore sslCAInfo by default Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqsh0uln5c.fsf_-_@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=github@brendanforster.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).