Skip to content

Commit d6b1d3b

Browse files
committed
http: give curl version warnings consistently
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 <[email protected]>
1 parent b67d40a commit d6b1d3b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

http.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -834,8 +834,7 @@ static CURL *get_curl_handle(void)
834834
#if LIBCURL_VERSION_NUM >= 0x072c00
835835
curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE);
836836
#else
837-
warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n"
838-
"your curl version is too old (< 7.44.0)");
837+
warning(_("CURLSSLOPT_NO_REVOKE not suported with cURL < 7.44.0"));
839838
#endif
840839
}
841840

@@ -908,8 +907,7 @@ static CURL *get_curl_handle(void)
908907
curl_easy_setopt(result, CURLOPT_PROTOCOLS,
909908
get_curl_allowed_protocols(-1));
910909
#else
911-
warning("protocol restrictions not applied to curl redirects because\n"
912-
"your curl version is too old (>= 7.19.4)");
910+
warning(_("Protocol restrictions not supported with cURL < 7.19.4"));
913911
#endif
914912
if (getenv("GIT_CURL_VERBOSE"))
915913
curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);

0 commit comments

Comments
 (0)