summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-03 00:53:59 +0900
committerJunio C Hamano <gitster@pobox.com>2018-11-03 00:53:59 +0900
commitcd69ec8cde54af1817630331fc441f493866f0d4 (patch)
tree491b6c63179560f899b96e9438899819394f1366 /http.c
parentd7b185973201d7263e84e76044ba3f2b37b1e8a3 (diff)
parentd6b1d3b2d15b2bde48e6e64ba1aa4436a49ca2e2 (diff)
downloadgit-cd69ec8cde54af1817630331fc441f493866f0d4.tar.gz
Merge branch 'jc/http-curlver-warnings'
Warning message fix. * jc/http-curlver-warnings: http: give curl version warnings consistently
Diffstat (limited to 'http.c')
-rw-r--r--http.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/http.c b/http.c
index 28009ca73a..3dc8c560d6 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);