Re: [PATCH v4 1/1] archive-zip: refactor 'path too long' error message to use Q_()

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 22, 2026, 17:41 UTC
Message-ID: <xmqq1p9hhbue.fsf@gitster.g>
In-Reply-To: <57e076d3-cfea-475d-b68d-a9f36746db35@gmail.com>

Phillip Wood <phillip.wood123@gmail.com> writes:

Show 31 quoted lines

> Hi Keryle
>
> On 20/10/2026 19:39, kerylefondji7@gmail.com wrote:
>> 
>> diff --git a/archive-zip.c b/archive-zip.c
>> index 6f73ca6d58..5ab3ba786f 100644
>> --- a/archive-zip.c
>> +++ b/archive-zip.c
>> @@ -328,8 +328,10 @@ static int write_zip_entry(struct archiver_args *args,
>>   	}
>>   
>>   	if (pathlen > 0xffff) {
>> -		return error(_("path too long (%d chars, SHA1: %s): %s"),
>> -				(int)pathlen, oid_to_hex(oid), path);
>> +	 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);
>
> The indentation is still messed up. If you look at the deleted lines you can see that
> we've lost a level of indentation inside the "if" block and the function arguments no
> longer line up. It should look like
>
> 	if (pathlen > 0xffff) {
> 		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);
> 	}
>
> Thanks

Thanks. Just in case Keryle is reading the message in a terminal or webmail app with variable width fonts, the easiest way to see what is wrong in the posted patch is to visit

  https://lore.kernel.org/git/57e076d3-cfea-475d-b68d-a9f36746db35@gmail.com/

which should show the patch in fixed-width font and even uses real tab chars properly (so you can click-hold on the left end of a line and move your mouse right to highlight the indentation to tell the difference between a run of spaces and a tab).