attempt with inlined impl

Author: vaidas-shopify

remote-curl.c

@@ -26,6 +26,7 @@
 #include "transport.h"
 #include "url.h"
 #include "write-or-die.h"
+#include "utf8.h"
 
 static struct remote *remote;
 /* always ends with a trailing slash */
@@ -540,10 +541,38 @@ static struct discovery *discover_refs(const char *service, int for_push)
 		show_http_message_fatal(&type, &charset, &buffer,
 					_("unable to access '%s' with http.pinnedPubkey configuration: %s"),
 					transport_anonymize_url(url.buf), curl_errorstr);
-	case HTTP_RATE_LIMITED:
-		show_http_message_fatal(&type, &charset, &buffer,
-					_("rate limited by '%s', please try again later"),
-					transport_anonymize_url(url.buf));
+	case HTTP_RATE_LIMITED: {
+		const char *p, *eol;
+		struct strbuf msgbuf = STRBUF_INIT;
+		char *anonymized_url = transport_anonymize_url(url.buf);
+
+		/*
+		 * We only show text/plain parts, as other types are likely
+		 * to be ugly to look at on the user's terminal.
+		 */
+		if (!strcmp(type.buf, "text/plain")) {
+			strbuf_addbuf(&msgbuf, &buffer);
+			if (charset.len)
+				strbuf_reencode(&msgbuf, charset.buf, get_log_output_encoding());
+
+			strbuf_trim(&msgbuf);
+			if (msgbuf.len) {
+				p = msgbuf.buf;
+				do {
+					eol = strchrnul(p, '\n');
+					fprintf(stderr, "remote: %.*s\n", (int)(eol - p), p);
+					p = eol + 1;
+				} while(*eol);
+			}
+			strbuf_release(&msgbuf);
+		}
+
+		strbuf_release(&type);
+		strbuf_release(&charset);
+		strbuf_release(&buffer);
+
+		die(_("rate limited by '%s', please try again later"), anonymized_url);
+	}
 	default:
 		show_http_message_fatal(&type, &charset, &buffer,
 					_("unable to access '%s': %s"),