From: Beat Bolli <dev+git@drbeat.li>
To: Ariadne Conill <ariadne@dereferenced.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2 2/3] log: add --no-use-mailmap option to complement --use-mailmap option
Date: Thu, 11 Jul 2019 20:27:04 +0200 [thread overview]
Message-ID: <5859bdb3-ce8e-d428-2e31-46e817a42e0c@drbeat.li> (raw)
In-Reply-To: <CAAOiGNyYyFpdkHXa8fY3OcLsZsiZXb72YUQ294f61EosxdK8Kg@mail.gmail.com>
On 11.07.19 20:25, Ariadne Conill wrote:
> Hello,
>
> On Thu, Jul 11, 2019 at 1:24 PM Beat Bolli <dev+git@drbeat.li> wrote:
>>
>> On 11.07.19 19:26, Ariadne Conill wrote:
>>> When mailmap is enabled by default or by configuration, it may be
>>> useful to override the default behaviour. Previously, it was
>>> possible to enable the mailmap feature when it was disabled by
>>> default or in the configuration, but it was not possible to disable
>>> the mailmap feature when it was enabled by default or by the
>>> configuration.
>>>
>>> The --no-use-mailmap option equalizes this by allowing the user to
>>> explicitly enable or disable the mailmap feature according to their
>>> requirements.
>>>
>>> Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
>>> ---
>>> Documentation/git-log.txt | 5 +++++
>>> builtin/log.c | 1 +
>>> 2 files changed, 6 insertions(+)
>>>
>>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
>>> index b02e922dc3..50bc8f7da2 100644
>>> --- a/Documentation/git-log.txt
>>> +++ b/Documentation/git-log.txt
>>> @@ -54,6 +54,11 @@ OPTIONS
>>> addresses to canonical real names and email addresses. See
>>> linkgit:git-shortlog[1].
>>>
>>> +--no-use-mailmap::
>>> + Do not use the mailmap file to map author and commiter names
>>> + and email addresses to canonical real names and email addresses.
>>> + See linkgit:git-shortlog[1].
>>> +
>>> --full-diff::
>>> Without this flag, `git log -p <path>...` shows commits that
>>> touch the specified paths, and diffs about the same specified
>>> diff --git a/builtin/log.c b/builtin/log.c
>>> index 3d2ce8fa3d..a9195bcb34 100644
>>> --- a/builtin/log.c
>>> +++ b/builtin/log.c
>>> @@ -167,6 +167,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>>> OPT__QUIET(&quiet, N_("suppress diff output")),
>>> OPT_BOOL(0, "source", &source, N_("show source")),
>>> OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
>>> + OPT_NEGBIT(0, "no-use-mailmap", &mailmap, N_("Do not use mail map file"), 1),
>>
>> This works already. OPT_BOOL automatically handles the negation. You
>> just have to add "[no-]" to the documentation of --use-mailmap.
>
> Aha. I was expecting it to behave like typical getopt_long() parsing,
> where you have to handle this yourself. No problem. I'll clean that
> up! Thanks for the tip.
>
> Ariadne
You're welcome!
Beat
next prev parent reply other threads:[~2019-07-11 18:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 17:26 [PATCH v2 0/3] use mailmap by default in git log Ariadne Conill
2019-07-11 17:26 ` [PATCH v2 1/3] log: use mailmap by default Ariadne Conill
2019-07-11 17:26 ` [PATCH v2 2/3] log: add --no-use-mailmap option to complement --use-mailmap option Ariadne Conill
2019-07-11 18:24 ` Beat Bolli
2019-07-11 18:25 ` Ariadne Conill
2019-07-11 18:27 ` Beat Bolli [this message]
2019-07-11 17:26 ` [PATCH v2 3/3] tests: add test for git log --no-use-mailmap Ariadne Conill
2019-07-11 17:32 ` Beat Bolli
2019-07-11 17:38 ` Ariadne Conill
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5859bdb3-ce8e-d428-2e31-46e817a42e0c@drbeat.li \
--to=dev+git@drbeat.li \
--cc=ariadne@dereferenced.org \
--cc=git@vger.kernel.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).