On 26 March 2018 at 17:54, Eric Blake <ebl...@redhat.com> wrote: > Hmm, on re-reading that, I wonder if shortlog will do the right thing when a > .mailmap entry exists. I'm trying to make sure we don't have to go > lower-level with use of 'git log --format=%ae' (vs. --format=%aE and/or log > --use-mailmap). > > /me goes and experiments with: > > diff --git i/.mailmap w/.mailmap > index cf689b9ec99..a90d7deebe6 100644 > --- i/.mailmap > +++ w/.mailmap > @@ -10,6 +10,7 @@ Edgar E. Iglesias <edgar.igles...@gmail.com> edgar_igl > <edgar_igl@c046a42c-6fe2- > Fabrice Bellard <fabr...@bellard.org> bellard > <bellard@c046a42c-6fe2-441c-8c8c-71466251a162> > James Hogan <jho...@kernel.org> <james.ho...@imgtec.com> > Jocelyn Mayer <l_ind...@magic.fr> j_mayer > <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162> > +Julia Suvorova <<jus...@mail.ru> Julia Suvorova via Qemu-devel > <qemu-devel@nongnu.org> > Paul Brook <p...@codesourcery.com> pbrook > <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> > Paul Burton <paul.bur...@mips.com> <paul.bur...@imgtec.com> > Paul Burton <paul.bur...@mips.com> <p...@archlinuxmips.org> > > Yay - shortlog still lists Julia's commit even with the mailmap in place > (but with a better spelling of her name), so I don't need to try anything > fancier. I'll post a separate patch for mailmap, then leave it up to you > whether to incorporate my shortlog snippet above into your build script.
Your mailmap change above seems to have a stray extra '<' in it -- was that added by the mailing list server, or is it in the original? thanks -- PMM
