summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-10 22:56:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-10 22:56:17 (GMT)
commit9488c18923f40573b692dbb8ea9c85c3cb4550a7 (patch)
treea9ee5cd0a835f6c1bbf908e1db7b551b95b8246b
parent61f9db7a50bca0642258c4541bdcd8bc97feb86b (diff)
parentbe22d92eac809ad2bfa2b7c83ad7cad5a15f1c43 (diff)
downloadgit-9488c18923f40573b692dbb8ea9c85c3cb4550a7.zip
git-9488c18923f40573b692dbb8ea9c85c3cb4550a7.tar.gz
git-9488c18923f40573b692dbb8ea9c85c3cb4550a7.tar.bz2
Merge branch 'jn/maint-http-error-message'
* jn/maint-http-error-message: http: avoid empty error messages for some curl errors http: remove extra newline in error message
-rw-r--r--http.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/http.c b/http.c
index a59cac4..fb3465f 100644
--- a/http.c
+++ b/http.c
@@ -851,8 +851,13 @@ static int http_request(const char *url, void *result, int target, int options)
init_curl_http_auth(slot->curl);
ret = HTTP_REAUTH;
}
- } else
+ } else {
+ if (!curl_errorstr[0])
+ strlcpy(curl_errorstr,
+ curl_easy_strerror(results.curl_result),
+ sizeof(curl_errorstr));
ret = HTTP_ERROR;
+ }
} else {
error("Unable to start HTTP request for %s", url);
ret = HTTP_START_FAILED;
@@ -908,7 +913,7 @@ int http_error(const char *url, int ret)
{
/* http_request has already handled HTTP_START_FAILED. */
if (ret != HTTP_START_FAILED)
- error("%s while accessing %s\n", curl_errorstr, url);
+ error("%s while accessing %s", curl_errorstr, url);
return ret;
}