From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 15:53:59 +0000 (+0900)
Subject: Merge branch 'jc/http-curlver-warnings'
X-Git-Tag: v2.20.0-rc0~76
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cd69ec8cde54af1817630331fc441f493866f0d4?ds=inline;hp=-c

Merge branch 'jc/http-curlver-warnings'

Warning message fix.

* jc/http-curlver-warnings:
http: give curl version warnings consistently
---

cd69ec8cde54af1817630331fc441f493866f0d4
diff --combined http.c
index 28009ca73a,2214100e3b..3dc8c560d6
--- a/http.c
+++ b/http.c
@@@ -834,8 -834,7 +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 +907,7 @@@
  	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);
@@@ -2463,7 -2461,7 +2461,7 @@@ int finish_http_object_request(struct h
  		unlink_or_warn(freq->tmpfile.buf);
  		return -1;
  	}
 -	if (hashcmp(freq->sha1, freq->real_sha1)) {
 +	if (!hasheq(freq->sha1, freq->real_sha1)) {
  		unlink_or_warn(freq->tmpfile.buf);
  		return -1;
  	}