On 21/5/26 08:20, Manos Pitsidianakis wrote:
On Wed, May 20, 2026 at 10:52 PM Philippe Mathieu-Daudé
<[email protected]> wrote:
Our ./scripts/get_maintainer.pl uses git .mailmap as a fallback:
$ ./scripts/get_maintainer.pl -h
usage: ./scripts/get_maintainer.pl [options] patchfile
./scripts/get_maintainer.pl [options] -f file|directory
--git-fallback => use git when no exact MAINTAINERS pattern (default: 1)
--git-since => git history to use (default: 1-year-ago)
--mailmap => use .mailmap file (default: 1)
...
Default options:
[--email --nogit --git-fallback --m --r --n --l --multiline
--pattern-depth=0 --remove-duplicates --rolestats]
(see the '--git-fallback' used as default option).
Per gitmailmap(5) man page:
... the file .mailmap [...] is used to map author and
committer names and email addresses to canonical real
names and email addresses.
I added my entries in the "replace old addresses by a more recent
one" section for this script use case, but we have been doing a
good cleanup at having all files covered in MAINTAINERS, so with
retrospective these entries aren't needed anymore (besides, using
them retroactively credits all my contributions to the latest
employer).
Hey Philippe,
As I posted here
https://lore.kernel.org/qemu-devel/[email protected]/T/#t
People who wish to use git log for employer attribution reasons must
use --no-mailmap.
mailmap is for updating names/emails, not attribution. I do not think
your patch is necessary.
Great, thank you for mentioning the --no-mailmap option.
Markus, Alex, does that option work for you?
Simply remove my mappings of that "old -> recent" section.
Reported-by: Markus Armbruster <[email protected]>
Suggested-by: Alex Bennée <[email protected]>
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
---
.mailmap | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index ce569d83f4a..82ff20b8ddb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -104,9 +104,6 @@ Paul Burton <[email protected]> <[email protected]>
Paul Burton <[email protected]> <[email protected]>
Paul Burton <[email protected]> <[email protected]>
Paul Burton <[email protected]> <[email protected]>
-Philippe Mathieu-Daudé <[email protected]> <[email protected]>
-Philippe Mathieu-Daudé <[email protected]> <[email protected]>
-Philippe Mathieu-Daudé <[email protected]> <[email protected]>
Pierrick Bouvier <[email protected]>
<[email protected]>
Roman Bolshakov <[email protected]> <[email protected]>
Sriram Yagnaraman <[email protected]>
<[email protected]>
--
2.53.0
