mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 21:46:10 +02:00
Code

Merge branch 'bs/forbid-i18n-of-protocol-token-in-fetch-pack' 

L10n support for a few error messages.

* bs/forbid-i18n-of-protocol-token-in-fetch-pack:
  fetch-pack: parameterize message containing 'ready' keyword
This commit is contained in:
Junio C Hamano 2022-02-23 16:58:03 -08:00
parent e6ebfd0e8c 3d3c23b3a7
commit c69e455bbc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fetch-pack.c
View 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;
}