Remove support for the magical "repo-abbrev" comment in .mailmap files. This was added to .mailmap parsing in , as a generalized feature of the git-shortlog Perl script added earlier in . There was no documentation or tests for this feature, and I don't think it's used in practice anymore. What it did was to allow you to specify a single string to be search-replaced with "/.../" in the .mailmap file. E.g. for linux.git's current .mailmap: git archive --firstname.lastname@example.org:linux-kernel/linux.git \ HEAD -- .mailmap | grep -a repo-abbrev # repo-abbrev: /pub/scm/linux/kernel/git/ Then when running e.g.: git shortlog --merges --author=Linus -1 v5.10-rc7..v5.10 | grep Merge We'd emit (the [...] is mine): Merge tag [...]git://git.kernel.org/.../tip/tip But will now emit: Merge tag [...]git.kernel.org/pub/scm/linux/kernel/git/tip/tip I think at this point this is just a historical artifact we can get rid of. It was initially meant for Linus's own use when we integrated the Perl script, but since then it seems he's stopped using it. Digging through Linus's release announcements on the LKML the last release I can find that made use of this output is Linux 2.6.25-rc6 back in March 2008. Later on Linus started using --no-merges, and nowadays seems to prefer some custom not-quite-shortlog format of merges from lieutenants. You will still see it on linux.git if you run "git shortlog" manually yourself with --merges, with this removed you can still get the same output with: git log --pretty=fuller v5.10-rc7..v5.10 | sed 's!/pub/scm/linux/kernel/git/!/.../!g' | git shortlog Arguably we should do the same for the search-replacing of "[PATCH]" at the beginning with "". That seems to be another relic of a bygone era when linux.git patches would have their E-Mail subject lines applied as-is by "git am" or whatever. But we documented that feature in "git-shortlog(1)", and it seems more widely applicable than something purely kernel-specific. 1.pull/953/head
7595e2ee6e(git-shortlog: make common repository prefix configurable with .mailmap, 2006-11-25) 2.
fa375c7f1b(Add git-shortlog perl script, 2005-06-04) 3. https://lore.kernel.org/lkml/ 4. https://lore.kernel.org/lkml/alpine.LFD.email@example.com/ 5. https://lore.kernel.org/lkml/BANLkTinrbh7Xi27an3uY7pDWrNKhJRYmEA@mail.gmail.com/ 6. https://lore.kernel.org/lkml/CAHk-=wg1+kf1AVzXA-RQX0zjM6t9J2Kay9xyuNqcFHWV-y5ZYw@mail.gmail.com/ Acked-by: Linus Torvalds <firstname.lastname@example.org> Signed-off-by: Ævar Arnfjörð Bjarmason <email@example.com> Signed-off-by: Junio C Hamano <firstname.lastname@example.org>
Ævar Arnfjörð Bjarmason committed by Junio C Hamano
9 changed files with 21 additions and 56 deletions
Reference in new issue