http: re-word http error message

peff · gitster · commit 39a570f26c95 · 2013-04-06T18:56:45.000-07:00
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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ static int http_get_file(const char url, const char filename, int options)`
`943`	`943`
`944`	`944`	`void http_error(const char *url)`
`945`	`945`	`{`
`946`		`- error("%s while accessing %s", curl_errorstr, url);`
	`946`	`+ error("unable to access '%s': %s", url, curl_errorstr);`
`947`	`947`	`}`
`948`	`948`
`949`	`949`	`int http_fetch_ref(const char base, struct ref ref)`