From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: kerylefondji7@gmail.com, git@vger.kernel.org,
christiancouder@gmail.com, siddharthasthana31@gmail.com
Subject: Re: [PATCH] archive-zip: refactor 'path too long' error message to use Q_()
Date: Mon, 19 Oct 2026 14:12:35 -0700 [thread overview]
Message-ID: <xmqqmrs92y4c.fsf@gitster.g> (raw)
In-Reply-To: <96187a3b-411c-42bd-8979-fb45006daa34@gmail.com> (Phillip Wood's message of "Mon, 19 Oct 2026 14:58:10 +0100")
Phillip Wood <phillip.wood123@gmail.com> writes:
> Hi Keryle
>
> On 19/10/2026 09:44, kerylefondji7@gmail.com wrote:
>> From: Keryle Fondji <kerylefondji7@gmail.com>
>>
>> The error message used "chars" even when pathlen was 1.
>
> Looking at the code below, pathlen has to be longer than 0xffff to
> trigger this message. However there can be more than one form of the
> plural string though. The gettext manual has the following example of
> the Polish translation of "file" for different numbers of files [1]
>
> 1 plik
> 2,3,4 pliki
> 5-21 plików
> 22-24 pliki
> 25-31 plików
>
> so using Q_() is correct, but we should explain that it is to
> accommodate different plural forms, rather than because pathlen can be 1.
Good.
>> Replace _() with Q_() to handle both singular and plural forms
>> correctly depending on the value of pathlen.
This is written better.
>> Signed-off-by: Keryle Fondji <kerylefondji7@gmail.com>
>> ---
>> archive-zip.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/archive-zip.c b/archive-zip.c
>> index 6f73ca6d58..e4f8ef5a36 100644
>> --- a/archive-zip.c
>> +++ b/archive-zip.c
>> @@ -328,7 +328,7 @@ static int write_zip_entry(struct archiver_args *args,
>> }
>>
>> if (pathlen > 0xffff) {
>> - return error(_("path too long (%d chars, SHA1: %s): %s"),
>> + return error(Q_("path too long (%d char, SHA1: %s): %s", "path too long (%d chars, SHA1: %s): %s", pathlen),
>> (int)pathlen, oid_to_hex(oid), path);
This is overly long and must be line-wrapped.
>> }
>>
next prev parent reply other threads:[~2026-10-19 21:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 8:44 [PATCH] archive-zip: refactor 'path too long' error message to use Q_() kerylefondji7
2026-10-19 13:58 ` Phillip Wood
2026-10-19 21:12 ` Junio C Hamano [this message]
2026-10-20 10:22 ` [PATCH v3 0/1] archive-zip: refactor 'path too long' error message kerylefondji7
2026-10-20 10:22 ` [PATCH v3 1/1] archive-zip: refactor 'path too long' error message to use Q_() kerylefondji7
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=xmqqmrs92y4c.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=christiancouder@gmail.com \
--cc=git@vger.kernel.org \
--cc=kerylefondji7@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=siddharthasthana31@gmail.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