On 03/26/2018 03:41 PM, Eric Blake wrote: > The list did not author any patches, but it does rewrite the > 'From:' header of messages sent from any domain with restrictive > SPF policies that would otherwise prevent the message from reaching > all list recipients. If a maintainer is not careful to undo the > list header rewrite, and the author did not include a manual > 'From:' line in the body to fix the munged header, then 'git am' > happily attributes the patch to the list. Add some mailmap > entries to correct the few that have escaped our attention; while > we also work on improving the tooling to catch the problem in > the future before a merge is even made.
Thanks! > > Also improve the comments occurring in the file, including line > length improvements. > > Signed-off-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4...@amsat.org> > --- > > Probably worth inclusion in 2.12-rc1, since it makes statistics > about the release easier to follow. > > .mailmap | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/.mailmap b/.mailmap > index cf689b9ec99..b02c357e9a1 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -1,6 +1,7 @@ > -# This mailmap just translates the weird addresses from the original import > into git > -# into proper addresses so that they are counted properly in git shortlog > output. > -# > +# This mailmap fixes up author names/addresses. > + > +# The first section translates weird addresses from the original git import > +# into proper addresses so that they are counted properly by git shortlog. > Andrzej Zaborowski <balr...@gmail.com> balrog > <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> > Anthony Liguori <anth...@codemonkey.ws> aliguori > <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> > Anthony Liguori <anth...@codemonkey.ws> Anthony Liguori <aligu...@us.ibm.com> > @@ -15,10 +16,19 @@ Paul Burton <paul.bur...@mips.com> > <paul.bur...@imgtec.com> > Paul Burton <paul.bur...@mips.com> <p...@archlinuxmips.org> > Thiemo Seufer <t...@networkno.de> ths > <ths@c046a42c-6fe2-441c-8c8c-71466251a162> > malc <av1...@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162> > + > # There is also a: > # (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162> > # for the cvs2svn initialization commit e63c3dc74bf. > -# > + > +# Next, translate a few commits where mailman rewrote the From: line due > +# to strict SPF, although we prefer to avoid adding more entries like that. > +Ed Swierk <eswi...@skyportsystems.com> Ed Swierk via Qemu-devel > <qemu-devel@nongnu.org> > +Ian McKellar <ianl...@google.com> Ian McKellar via Qemu-devel > <qemu-devel@nongnu.org> > +Julia Suvorova <jus...@mail.ru> Julia Suvorova via Qemu-devel > <qemu-devel@nongnu.org> > +Justin Terry (VM) <jute...@microsoft.com> Justin Terry (VM) via Qemu-devel > <qemu-devel@nongnu.org> > + > + > # Also list preferred name forms where people have changed their > # git author config > Daniel P. Berrangé <berra...@redhat.com> >
