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

[PATCH v4 0/3] use mailmap by default in git log

From
Ariadne Conill <ariadne@dereferenced.org>
Date
Jul 11, 2019, 18:37 UTC
Message-ID
<20190711183727.8058-1-ariadne@dereferenced.org>

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: Ariadne Conill
Message 1 of 12 in “use mailmap by default in git log”
  1. 0/3 use mailmap by default in git logAriadne Conill, Jul 11, 2019
  2. 1/3 log: use mailmap by defaultAriadne Conill, Jul 11, 2019
  3. 2/3 log: document --no-use-mailmap optionAriadne Conill, Jul 11, 2019
  4. 3/3 tests: rework mailmap tests for git logAriadne Conill, Jul 11, 2019
  5. Martin ÅgrenJul 11, 2019
  6. Junio C HamanoJul 11, 2019
  7. Junio C HamanoJul 11, 2019
  8. Ariadne ConillJul 12, 2019
  9. Junio C HamanoJul 12, 2019
  10. Junio C HamanoJul 12, 2019
  11. Ariadne ConillJul 12, 2019
  12. CB BaileySep 22, 2019

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.