On Mon, Mar 16, 2020 at 5:29 PM Junio C Hamano <gitster@xxxxxxxxx> wrote:
> The option name "--use-mailmap" looks OK, but it becomes awkward
> when you have to negate it, i.e. "--no-use-mailmap". I, perhaps
> with many other users, always try "--no-mailmap" and become unhappy
> to see it fail.
>
> Add an alias "--[no-]mailmap" to remedy this.
>
> Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
> ---
> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
> @@ -49,6 +49,7 @@ OPTIONS
> +--[no-]mailmap::
> --[no-]use-mailmap::
> Use mailmap file to map author and committer names and email
> addresses to canonical real names and email addresses. See
Here, the documentation seems to promote --mailmap over --use-mailmap.
> diff --git a/builtin/log.c b/builtin/log.c
> @@ -173,6 +173,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
> OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
> + OPT_ALIAS(0, "mailmap", "use-mailmap"),
So, along the lines of patch 2/3, I wonder if this should instead make
--mailmap the "real" option and --use-mailmap the alias; namely, use
OPT_ALIAS for --use-mailmap and place it after --mailmap. (Genuine but
very minor question; should not hold up acceptance of patch.)
