From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-trivial@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org
Subject: Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output
Date: Sat, 18 Jan 2020 15:08:42 +0100 [thread overview]
Message-ID: <73f18b1d-c680-4db7-a682-9f65aeac79a9@redhat.com> (raw)
In-Reply-To: <87tv4sq4hn.fsf@dusky.pond.sub.org>
On 1/18/20 2:27 PM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>
>> On 1/18/20 8:10 AM, Markus Armbruster wrote:
>>> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
>>>
>>>> Most of these developers have the Signed-off-by tag properly
>>>> written, but not the author/commiter name. Fix this.
>>>> Also we incorrectly wrote Arei Gonglei name, update and reorder.
>>>>
>>>> git-log does not use this file by default until you specify the
>>>> --use-mailmap flag:
>>>>
>>>> $ git log --use-mailmap
>>>>
>>>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>>> ---
>>>> .mailmap | 29 ++++++++++++++++++++++++++++-
>>>> 1 file changed, 28 insertions(+), 1 deletion(-)
>>>>
>>>> diff --git a/.mailmap b/.mailmap
>>>> index 3816e4effe..1a859d9e65 100644
>>>> --- a/.mailmap
>>>> +++ b/.mailmap
>>>> @@ -56,6 +56,10 @@ Aaron Lindsay <aaron@os.amperecomputing.com>
>>>> Alexey Gerasimenko <x1917x@gmail.com>
>>>> Alex Ivanov <void@aleksoft.net>
>>>> Andreas Färber <afaerber@suse.de>
>>>> +Andreas Färber <andreas.faerber@web.de>
>>>> +Andreas Färber <andreas.faerber@web.de> <andreas.faerber>
>>>> +Arei Gonglei <arei.gonglei@huawei.com>
>>>> +Arei Gonglei <arei.gonglei@huawei.com> <root@ceth6.(none)>
>>>
>>> I can't find this one in git-log.
>>
>> I was first surprised:
>>
>> $ git log -1 3b08098b40
>> commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7
>> Author: Gonglei <arei.gonglei@huawei.com>
>> AuthorDate: Wed Dec 3 18:25:46 2014 +0000
>> Commit: root <root@ceth6.(none)>
>> CommitDate: Mon Dec 22 14:39:21 2014 +0800
>>
>> bootdevice: add validate check for qemu_boot_set()
>>
>> Signed-off-by: Gonglei <arei.gonglei@huawei.com>
>> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>>
>> After thinking for a bit I remembered I once changed my default format:
>>
>> $ git config format.pretty
>> fuller
>
> Aha! Could've thought of this myself...
>
>> I suppose I should add this in the commit description.
>
> Can't hurt.
OK will do, thank for the review!
> [...]
>>>> Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
>>>> Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
>>>> +Siwei Zhuang <siwei.zhuang@data61.csiro.au>
>>>
>>> It's actually spelled Siwei.Zhuang@data61.csiro.au in git-log.
>>> Shouldn't matter.
>>
>> Correct:
>>
>> $ git shortlog -e 6478dd745d~..6478dd745d
>> Zhuang, Siwei (Data61, Kensington NSW) <Siwei.Zhuang@data61.csiro.au> (1):
>> hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()
>>
>> $ git shortlog -e 6478dd745d~..6478dd745d
>> Siwei Zhuang <Siwei.Zhuang@data61.csiro.au> (1):
>> hw/riscv: Add optional symbol callback ptr to riscv_load_kernel()
>
> Suggest to adjust case if you respin.
>
>> Thanks for caring checking all entries!
>
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>
> [...]
>
prev parent reply other threads:[~2020-01-18 14:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-18 18:57 [PATCH] mailmap: Add more entries to sanitize 'git log' output Philippe Mathieu-Daudé
2020-01-17 16:52 ` Philippe Mathieu-Daudé
2020-01-18 7:10 ` Markus Armbruster
2020-01-18 8:17 ` Philippe Mathieu-Daudé
2020-01-18 13:27 ` Markus Armbruster
2020-01-18 14:08 ` Philippe Mathieu-Daudé [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=73f18b1d-c680-4db7-a682-9f65aeac79a9@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).