Merge branch 'maint'

* maint:
  asciidoc markup fixes
  Fail properly when cloning from invalid HTTP URL

Conflicts:
	Documentation/git-push.txt

1 files changed, 5 insertions, 8 deletions

diff --git a/transport.c b/transport.c
index 6eb65b873a..71433d9997 100644
--- a/transport.c
+++ b/transport.c
@@ -463,17 +463,14 @@ static struct ref *get_refs_via_curl(struct transport *transport)
 		run_active_slot(slot);
 		if (results.curl_result != CURLE_OK) {
 			strbuf_release(&buffer);
-			if (missing_target(&results)) {
-				return NULL;
-			} else {
-				error("%s", curl_errorstr);
-				return NULL;
-			}
+			if (missing_target(&results))
+				die("%s not found: did you run git update-server-info on the server?", refs_url);
+			else
+				die("%s download error - %s", refs_url, curl_errorstr);
 		}
 	} else {
 		strbuf_release(&buffer);
-		error("Unable to start request");
-		return NULL;
+		die("Unable to start HTTP request");
 	}
 
 	data = buffer.buf;