Re: [PATCH] http: give curl version warnings consistently
- From
Jeff King <peff@peff.net>
- Date
- Oct 25, 2018, 06:23 UTC
- Message-ID
- <20181025062332.GD11460@sigill.intra.peff.net>
- In-Reply-To
- <xmqqsh0uln5c.fsf_-_@gitster-ct.c.googlers.com>
On Thu, Oct 25, 2018 at 12:29:19PM +0900, Junio C Hamano wrote:
Show 9 quoted lines
> 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.
This is definitely an improvement.
Show 7 quoted lines
> @@ -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"));This loses the mention of redirects, but I think that is actually a bonus. The #ifdef'd code covers both original and redirected requests.
-Peff