Merge branch 'bk/mailmap-wo-the-repository' into next

Wean the mailmap code off of the_repository dependency.

* bk/mailmap-wo-the-repository:
  mailmap: drop global config variables
  mailmap: stop using the_repository

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc ref-filter.c
Simple merge