DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 87628606A31F
DKIM2-Signature: i=1; m=1; t=1792698549; d=pobox.com;
	mf=PGdpdHN0ZXJAcG9ib3guY29tPg==;
	rt=PGdpdEB2Z2VyLmtlcm5lbC5vcmc+;
	s=fm1:rsa-sha256:UAW2xku+3NZo0no4LhxoFTLUPGksrRdoIwpRwWnzFzaEE5f
	TgDtqSRIgcBJRXIwg+LrkMfvQTX1OKjb25guJELUXII1OfesOBfNnws3qHL8frnn
	3tzOdf/GgIFW48+krs4fBqbrPx3U7ahkDwdzzeXgiS9YCNBKCLUf5pPWXyMRR4Tp
	+PWfzoJ+7f+fx9OhpDc90aXEjRTHf0Crpyh6BHQkHX2TSFx64D6YCTbjPRkY3cn9
	mDVDjMWbGoMOu2oYtzPVJJrthgCDF0SJALulcYOnIy3w7Z+it4kiok3Z5VzNCj+q
	qRNkUbL/eHj42adT/Dk1sgHmLyuDCGBIpsKNglg==;
Message-Instance: m=1; h=sha256:CimdWzMfE5horUApvkC7UjoKAFqbWDiQQOngexS0Po0=:K3NRDt1hP4l4Xer9+hdLMmkiiXjI+LSux4Jdwe0ObKE=;
Feedback-ID: if26b431b:Fastmail
From: Junio C Hamano <gitster@pobox.com>
To: "Ammaar Bakshi via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,  Ammaar Bakshi <the.ammaar.ic@gmail.com>
Subject: Re: [PATCH] difftool: translate "combined diff formats" error message
In-Reply-To: <pull.2447.git.git.1792219239440.gitgitgadget@gmail.com> (Ammaar
	Bakshi via GitGitGadget's message of "Sat, 17 Oct 2026 06:40:39
	+0000")
References: <pull.2447.git.git.1792219239440.gitgitgadget@gmail.com>
Date: Thu, 22 Oct 2026 12:49:07 -0700
Message-ID: <xmqqy0bpecss.fsf@gitster.g>
User-Agent: Gnus/5.13 (Gnus v5.13)
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain

"Ammaar Bakshi via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: AMMAAR-IC <the.ammaar.ic@gmail.com>
>
> The error shown when "git difftool --dir-diff" is given a combined
> diff format ('-c' or '--cc') is wrapped in N_(), which only marks the
> string for extraction by xgettext and does nothing at runtime. As the
> string is passed straight to die(), users always see it in English,
> even though it already has translations in the po files.
>
> Use _() instead, and adjust the indentation of the continuation lines
> to match.
>
> Signed-off-by: AMMAAR-IC <the.ammaar.ic@gmail.com>

The name that appears on the "From:" header in your email, "Ammaar
Bakshi <the.ammaar.ic@gmail.com>", somehow looks more real than the
handle-looking "AMMAAR-IC".

Please consult Documentation/SubmittingPatches and specifically look
for [[dco]] and [[real-name]].

The patch text may look like an improvement but without a proper
authorship and sign-off, we cannot use the change in our project.

Thanks.

> ---
>     difftool: translate "combined diff formats" error message
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2447%2FAmmaarBakshi%2Fdifftool-i18n-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2447/AmmaarBakshi/difftool-i18n-v1
> Pull-Request: https://github.com/git/git/pull/2447
>
>  builtin/difftool.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/builtin/difftool.c b/builtin/difftool.c
> index bc7b2ea443..13b3d3ce47 100644
> --- a/builtin/difftool.c
> +++ b/builtin/difftool.c
> @@ -450,9 +450,9 @@ static int run_dir_diff(struct repository *repo,
>  		const char *src_path, *dst_path;
>  
>  		if (starts_with(info.buf, "::"))
> -			die(N_("combined diff formats ('-c' and '--cc') are "
> -			       "not supported in\n"
> -			       "directory diff mode ('-d' and '--dir-diff')."));
> +			die(_("combined diff formats ('-c' and '--cc') are "
> +			      "not supported in\n"
> +			      "directory diff mode ('-d' and '--dir-diff')."));
>  
>  		if (parse_index_info(repo, info.buf, &lmode, &rmode, &loid, &roid, &status))
>  			break;
>
> base-commit: 6de20f6092dcf9bdb1c8efe03db4b70c82b423dd