From: Ariadne Conill <ariadne@dereferenced.org>
To: git@vger.kernel.org
Cc: Ariadne Conill <ariadne@dereferenced.org>
Subject: [PATCH v4 0/3] use mailmap by default in git log
Date: Thu, 11 Jul 2019 13:37:24 -0500 [thread overview]
Message-ID: <20190711183727.8058-1-ariadne@dereferenced.org> (raw)
It is not uncommon for people to change their name or e-mail address.
To facilitate this, Git provides support for the `.mailmap` file,
which contains a list of identities and previously used e-mail
addresses that are associated with that identity.
Unfortunately, while Git's support for the `.mailmap` file is generally
excellent, I recently discovered that `git log` does not treat the
mail map file the same as the other tools, instead requiring an
explicit flag to use the mailmap file.
I believe this is an unfortunate flaw, as the mailmap file should
ideally contain the most current known contact information for a
contributor, allowing anyone to contact the contributor about their
patches in the future.
This should be the finished version of the patch set, thanks to
everyone who has helped review it!
New in version 4:
- Remove reundant `--no-use-mailmap` option, the option parsing
code automatically handles negation.
- Update config/log.txt documentation to reflect the new default.
New in version 3:
- Rework many mailmap tests to drop redundant `--use-mailmap` and
more rigorously test --no-use-mailmap and configuration variants.
- Typo fixes in the commit messages.
New in version 2:
- The `--no-use-mailmap` option, which complements `--use-mailmap`.
- Tests for `--no-use-mailmap`.
Ariadne Conill (3):
log: use mailmap by default
log: document --no-use-mailmap option
tests: rework mailmap tests for git log
Documentation/config/log.txt | 4 +--
Documentation/git-log.txt | 2 +-
builtin/log.c | 2 +-
t/t4203-mailmap.sh | 49 ++++++++++++++++++++++++++++++------
4 files changed, 45 insertions(+), 12 deletions(-)
--
2.17.1
next reply other threads:[~2019-07-11 18:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-11 18:37 Ariadne Conill [this message]
2019-07-11 18:37 ` [PATCH v4 1/3] log: use mailmap by default Ariadne Conill
2019-07-11 18:37 ` [PATCH v4 2/3] log: document --no-use-mailmap option Ariadne Conill
2019-07-11 18:37 ` [PATCH v4 3/3] tests: rework mailmap tests for git log Ariadne Conill
2019-07-11 19:32 ` Martin Ågren
2019-07-11 19:30 ` [PATCH v4 0/3] use mailmap by default in " Junio C Hamano
2019-07-11 19:34 ` Junio C Hamano
2019-07-12 8:40 ` Ariadne Conill
2019-07-12 14:17 ` Junio C Hamano
2019-07-12 14:49 ` Junio C Hamano
2019-07-12 16:17 ` Ariadne Conill
2019-09-22 21:00 ` CB Bailey
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=20190711183727.8058-1-ariadne@dereferenced.org \
--to=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).