Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Phillip Wood <phillip.wood123@gmail.com>
Cc: kerylefondji7@gmail.com,  phillip.wood@dunelm.org.uk,
	git@vger.kernel.org,  christian.couder@gmail.com,
	siddharthasthana31@gmail.com
Subject: Re: [PATCH v4 1/1] archive-zip: refactor 'path too long' error message to use Q_()
Date: Thu, 22 Oct 2026 10:41:29 -0700	[thread overview]
Message-ID: <xmqq1p9hhbue.fsf@gitster.g> (raw)
In-Reply-To: <57e076d3-cfea-475d-b68d-a9f36746db35@gmail.com> (Phillip Wood's message of "Thu, 22 Oct 2026 15:29:30 +0100")

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

> 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).

  reply	other threads:[~2026-10-22 17:41 UTC|newest]

Thread overview: 11+ 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
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
2026-10-20 15:05         ` Phillip Wood
2026-10-20 18:39     ` [PATCH v4 0/1] " kerylefondji7
2026-10-20 18:39       ` [PATCH v4 1/1] " kerylefondji7
2026-10-22 14:29         ` Phillip Wood
2026-10-22 17:41           ` Junio C Hamano [this message]
2026-10-22 10:28     ` [PATCH v4] archive-zip: refactor 'path too long' error 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=xmqq1p9hhbue.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=christian.couder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kerylefondji7@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --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