Thread (1 message) 1 message, 1 author, 2021-12-23

Re: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword

From: Junio C Hamano <hidden>
Date: 2021-12-23 01:24:08

Ævar Arnfjörð Bjarmason [off-list ref] writes:
quoted
diff --git a/fetch-pack.c b/fetch-pack.c
index 34987a2c30..51385cb3c9 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -1415,9 +1415,17 @@ static int process_ack(struct fetch_negotiator *negotiator,
 	 * otherwise.
 	 */
 	if (*received_ready && reader->status != PACKET_READ_DELIM)
-		die(_("expected packfile to be sent after 'ready'"));
+		/*
+		 * TRANSLATORS: The parameter will be 'ready', a protocol
+		 * keyword.
+		 */
+		die(_("expected packfile to be sent after '%s'"), "ready");
 	if (!*received_ready && reader->status != PACKET_READ_FLUSH)
-		die(_("expected no other sections to be sent after no 'ready'"));
+		/*
+		 * TRANSLATORS: The parameter will be 'ready', a protocol
+		 * keyword.
+		 */
+		die(_("expected no other sections to be sent after '%s'"), "ready");
 
 	return 0;
 }
base-commit: 69a9c10c95e28df457e33b3c7400b16caf2e2962
This version (and earlier ones, really) looks good to me. Thanks!
Trusting your ack wasted me one integration cycle by not looking at
it myself X-<.

There is "no" missing from the latter message.

Back to finishing today's (belated) integration cycle.  Hopefully I
can finish before dinner.

Thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help