From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Bagas Sanjaya <bagasdotme@gmail.com>,
git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword
Date: Wed, 22 Dec 2021 17:24:03 -0800 [thread overview]
Message-ID: <xmqqtuf0cdvw.fsf@gitster.g> (raw)
In-Reply-To: <211222.86a6gtoyg2.gmgdl@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Wed, 22 Dec 2021 09:06:30 +0100")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>> 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.
prev parent reply other threads:[~2021-12-23 1:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-22 7:58 [PATCH v4] fetch-pack: parameterize message containing 'ready' keyword Bagas Sanjaya
2021-12-22 8:06 ` Ævar Arnfjörð Bjarmason
2021-12-23 1:24 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtuf0cdvw.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=bagasdotme@gmail.com \
--cc=git@vger.kernel.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).