]> git.ipfire.org Git - thirdparty/git.git/commitdiff
fetch-pack: parameterize message containing 'ready' keyword
authorBagas Sanjaya <bagasdotme@gmail.com>
Wed, 22 Dec 2021 07:58:06 +0000 (14:58 +0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Feb 2022 22:37:09 +0000 (14:37 -0800)
The protocol keyword 'ready' isn't meant for translation. Pass it as
parameter instead of spell it in die() message (and potentially confuse
translators).

Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fetch-pack.c

index 34987a2c30d5a617bc44a9a632151abc354b034c..3a98d66e81ec0c86ec6e0d8873e14c682df97462 100644 (file)
@@ -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 no '%s'"), "ready");
 
        return 0;
 }