Re: [PATCH v3 1/4] i18n: factorize more 'incompatible options' messages

From: Johannes Sixt <j6t@kdbg.org>
Date: Jan 31, 2022, 07:15 UTC
Message-ID: <38b59dec-0ae5-ebed-18f0-bec0a3aa3333@kdbg.org>
In-Reply-To: <aac3f9821c7f8927ab7cb65bd5c443f5a0174068.1643580113.git.gitgitgadget@gmail.com>

Am 30.01.22 um 23:01 schrieb Jean-Noël Avila via GitGitGadget:

> diff --git a/parse-options.h b/parse-options.h
> index e22846d3b7b..68f7ae9c31a 100644
> --- a/parse-options.h
> +++ b/parse-options.h

Show 6 quoted lines

> @@ -339,4 +355,5 @@ int parse_opt_tracking_mode(const struct option *, const char *, int);
>  #define OPT_PATHSPEC_FILE_NUL(v)  OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character"))
>  #define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after"))
>  
> +
>  #endif

An unnecessary remnant from the earlier round?

Except for this, the patch looks good.

-- Hannes