undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http: give curl version warnings consistently

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2018-10-25 12:22:22 +09:00
parent b67d40adbb
commit d6b1d3b2d1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
http.c
View File

@ -834,8 +834,7 @@ static CURL *get_curl_handle(void)
#if LIBCURL_VERSION_NUM >= 0x072c00 #if LIBCURL_VERSION_NUM >= 0x072c00
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE); curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
#else #else
warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n" warning(_("CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"));
"your curl version is too old (< 7.44.0)");
#endif #endif
} }
@ -908,8 +907,7 @@ static CURL *get_curl_handle(void)
curl_easy_setopt(result, CURLOPT_PROTOCOLS, curl_easy_setopt(result, CURLOPT_PROTOCOLS,
get_curl_allowed_protocols(-1)); get_curl_allowed_protocols(-1));
#else #else
warning("protocol restrictions not applied to curl redirects because\n" warning(_("Protocol restrictions not supported with cURL < 7.19.4"));
"your curl version is too old (>= 7.19.4)");
#endif #endif
if (getenv("GIT_CURL_VERBOSE")) if (getenv("GIT_CURL_VERBOSE"))
curl_easy_setopt(result, CURLOPT_VERBOSE, 1L); curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);