http: re-word http error message

When we report an http error code, we say something like:

error: The requested URL reported failure: 403 Forbidden while accessing http://example.com/repo.git

Everything between "error:" and "while" is written by curl,
and the resulting sentence is hard to read (especially
because there is no punctuation between curl's sentence and
the remainder of ours). Instead, let's re-order this to give
better flow:

error: unable to access 'http://example.com/repo.git: The requested URL reported failure: 403 Forbidden

This is still annoyingly long, but at least reads more
clearly left to right.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http.c b/http.c
index 5e6f67d0049f2dd18f8e861cf3949e9f8b4a30b6..64068a2fc7248d377401d31e5d8aa1ecd82fcbd9 100644 (file)
--- a/http.c
+++ b/http.c
@@ -943,7 +943,7 @@ static int http_get_file(const char *url, const char *filename, int options)
 
 void http_error(const char *url)
 {
-       error("%s while accessing %s", curl_errorstr, url);
+       error("unable to access '%s': %s", url, curl_errorstr);
 }
 
 int http_fetch_ref(const char *base, struct ref *ref)