git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] difftool: translate "combined diff formats" error message

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 22, 2026, 19:49 UTC
Message-ID
<xmqqy0bpecss.fsf@gitster.g>
In-Reply-To
<pull.2447.git.git.1792219239440.gitgitgadget@gmail.com>
"Ammaar Bakshi via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 12 quoted lines
> 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.
Show 29 quoted lines
> ---
>     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
Previous: Ammaar Bakshi via GitGitGadget
Message 2 of 2 in “difftool: translate "combined diff formats" error message”
  1. difftool: translate "combined diff formats" error messageAmmaar Bakshi via GitGitGadget, Oct 17, 2026
  2. Junio C HamanoOct 22, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.