On Tue, 2 Apr 2024 at 11:41, Michael Tokarev <m...@tls.msk.ru> wrote:
>
>
> > Author: Stefan Weil via <qemu-triv...@nongnu.org>
>
> *SIGH* This happened *again*.
>
> > (you'll need to tell git log "--no-mailmap" to not get confused
> > by the mapping we have for the last time one of these slipped
> > through...)
>
> Now this is interesting. And this is exactly why I haven't noticed
> it - I did pay attention to Author lines this time. -- because
> it is displayed with mailmap applied. How very useful.
>
> I have to use `git show --no-mailmap' to see the original " via.."
> version.
FWIW my apply-pullreq script makes this check for this:
if git shortlog --author='qemu-.*@nongnu\.org' master..staging | grep .; then
echo "ERROR: pull request includes commits attributed to list"
exit 1
fi
(This doesn't pass --no-mailmap, because git shortlog doesn't
take that option, and the --author match is done on the "true"
author, not the mapped one. This is the kind of orthogonality
in command line UI that we have come to expect from git ;-))
-- PMM
