Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1isjIs-0003Xp-Rv for mharc-qemu-trivial@gnu.org; Sat, 18 Jan 2020 03:17:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38919) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isjIo-0003S6-Sg for qemu-trivial@nongnu.org; Sat, 18 Jan 2020 03:17:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isjIm-0003iU-6T for qemu-trivial@nongnu.org; Sat, 18 Jan 2020 03:17:54 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56132 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isjIm-0003i6-3A for qemu-trivial@nongnu.org; Sat, 18 Jan 2020 03:17:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579335471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HbD556K4Kcdc1ftNc3oZXiSb0lISAq3qhfTl3DEXZ88=; b=LHM+URlaEzi+IEYI9jF2FOYZZMdTlT/mWMIyWZKPQDxdfvW+UzV804F8jAkoUY/fjehnnr JBq3eRwYM/l8yydXsXqfxJEQXFpCPbnkv5u76RQczcdRPHilrh8QYZ/vJonXj4V8uCwrHV +hrUI9OXm6tBkT8IDtapxg3dG+suVnI= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-412-xPPJ343sOpuD8jwrDHTIAw-1; Sat, 18 Jan 2020 03:17:46 -0500 Received: by mail-wr1-f70.google.com with SMTP id t3so11450230wrm.23 for ; Sat, 18 Jan 2020 00:17:46 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wfMI0dKcwn6eyAUiBNTts9wAGwI7Kz5Biaqg15aiOXM=; b=LJFpf3UUfpiD9w/2/FPZI9CuFCEOCXDM9cAV5aAe3tjZP9dK62xus9YhJo98iawMdm hWs5G1Q1MAD3owFvzZ1IEWu/FGwlxI3aYxHovkVIj1i3CpjK8Y2KWwrZT+r3HQ3Swelz HeEXmcbQ/uEkTy5h4CkTxIwlUcPJhcf2/ArvTxE7i3xCobnLb8LHvqP/tQ3cwBmAEYvT 167v8jlCdH605R/KFi590SyvAoAE10aAnH+JCkkV/PKz3f3+3IUAnwZWv3duxzurir/f 1YSWWeiDI8BU85BWsKhwdGlEY9D6ZYijpmI2IkAflBvRLgX3YgVc9LgZkjEloc+Hw3HW MAZg== X-Gm-Message-State: APjAAAW9i/TnvA0kZaJLCS4cirkq+uT2/YmadKrsSngn9q7/YPCAUDGp 7xKN96kGjm6WilP0U+Q48fGGMZ+qt2HElkbW9HODM49yRwwCZJuftfTstk78fbrwHkHqJDQtQYR BlMdRtRbKmAyBy4l6kQ== X-Received: by 2002:adf:fd0d:: with SMTP id e13mr7354729wrr.421.1579335465364; Sat, 18 Jan 2020 00:17:45 -0800 (PST) X-Google-Smtp-Source: APXvYqwtnV5tfZibxNxacRxv0lb1Onp18HgqdODOO3WNFcLEw58di9i2wDscw+y4QE+mHMH79hvWIA== X-Received: by 2002:adf:fd0d:: with SMTP id e13mr7354699wrr.421.1579335464834; Sat, 18 Jan 2020 00:17:44 -0800 (PST) Received: from [192.168.1.35] (113.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.113]) by smtp.gmail.com with ESMTPSA id n187sm13444180wme.28.2020.01.18.00.17.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 18 Jan 2020 00:17:44 -0800 (PST) Subject: Re: [PATCH] mailmap: Add more entries to sanitize 'git log' output To: Markus Armbruster Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, =?UTF-8?Q?Alex_Benn=c3=a9e?= References: <20191218185723.7738-1-philmd@redhat.com> <87h80ts0ii.fsf@dusky.pond.sub.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Sat, 18 Jan 2020 09:17:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <87h80ts0ii.fsf@dusky.pond.sub.org> Content-Language: en-US X-MC-Unique: xPPJ343sOpuD8jwrDHTIAw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jan 2020 08:17:57 -0000 On 1/18/20 8:10 AM, Markus Armbruster wrote: > Philippe Mathieu-Daud=C3=A9 writes: >=20 >> 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=C3=A9 >> --- >> .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 >> Alexey Gerasimenko >> Alex Ivanov >> Andreas F=C3=A4rber >> +Andreas F=C3=A4rber >> +Andreas F=C3=A4rber >> +Arei Gonglei >> +Arei Gonglei >=20 > I can't find this one in git-log. I was first surprised: $ git log -1 3b08098b40 commit 3b08098b409c0fb28f85436ba1adeb1d401ec8f7 Author: Gonglei AuthorDate: Wed Dec 3 18:25:46 2014 +0000 Commit: root CommitDate: Mon Dec 22 14:39:21 2014 +0800 bootdevice: add validate check for qemu_boot_set() Signed-off-by: Gonglei Reviewed-by: Markus Armbruster After thinking for a bit I remembered I once changed my default format: $ git config format.pretty fuller I suppose I should add this in the commit description. >> Bandan Das >> Benjamin MARSILI >> Beno=C3=AEt Canet >> @@ -67,27 +71,36 @@ Brad Smith >> Brijesh Singh >> Brilly Wu >> C=C3=A9dric Vincent >> +Chai Wen >> +Chaojian Hu >> CheneyLin >> +Chen Fan >> Chen Gang >> Chen Gang >> Chen Gang >> Chen Wei-Ren >> Christophe Lyon >> +Christoph Hellwig >> Collin L. Walling >> Daniel P. Berrang=C3=A9 >> +Disheng Su >> +Dunrong Huang >> Eduardo Otubo >> Fabrice Desclaux >> Fernando Luis V=C3=A1zquez Cao >> Fernando Luis V=C3=A1zquez Cao >> Gautham R. Shenoy >> Gautham R. Shenoy >> -Gonglei (Arei) >> Guang Wang >> Hailiang Zhang >> Herv=C3=A9 Poussineau >> +Hiroyuki Obinata >> Jakub Jerm=C3=A1=C5=99 >> Jakub Jerm=C3=A1=C5=99 >> +Jay Zhou >> Jean-Christophe Dubois >> +Jean-Christophe Dubois >> +Jia Lina >> Jind=C5=99ich Makovi=C4=8Dka >> John Arbuckle >> Juha Riihim=C3=A4ki >> @@ -96,9 +109,11 @@ Jun Li >> Laurent Vivier >> Leandro Lupori >> Li Guang >> +Lili Huang >=20 > I can't find this one in git-log. $ git log -1 76349f5ba8 commit 76349f5ba8f4e2f0b8c93c12ec0950a8bc77408a Author: Gonglei AuthorDate: Thu Jan 29 13:13:47 2015 +0000 Commit: Lili CommitDate: Tue Mar 3 13:13:21 2015 +0800 bootdevice: add check in restore_boot_order() qemu_boot_set() can't fail in restore_boot_order(), then simply assert it doesn't fail, by passing &error_abort if boot_set_handler set. Suggested-by: Markus Armbruster Signed-off-by: Gonglei Reviewed-by: Markus Armbruster >> Liming Wang >> linzhecheng >> Liran Schour >> +Li Tianqing >> Liu Yu >> Liu Yu >> Li Zhang >> @@ -112,11 +127,14 @@ Marc Mar=C3=AD >> Marc Mar=C3=AD >> Michael Avdienko >> Michael S. Tsirkin >> +Michael S. Tsirkin >> +Michael Tokarev >=20 > I can't find these two in git-log. $ git log -1 eb83c2030a commit eb83c2030aa037b4c6037bfa3cbe181343dc6a8b Author: Changlong Xie AuthorDate: Mon Jul 25 11:48:00 2016 +0800 Commit: Michael Tokarev CommitDate: Tue Sep 13 18:12:34 2016 +0300 $ git log -1 572992eefa commit 572992eefa74bfb92c24a28bd268de91a9311b0f Author: Alex Williamson AuthorDate: Thu Jun 14 12:16:57 2012 -0600 Commit: Michael S. Tsirkin CommitDate: Mon Jun 18 10:21:12 2012 +0300 >> Munkyu Im >> Nicholas Bellinger >> Nicholas Thomas >> Nikunj A Dadhania >> Orit Wasserman >> +Pan Nengyuan >> Paolo Bonzini >> Pavel Dovgaluk >> Pavel Dovgaluk >> @@ -124,15 +142,23 @@ Pavel Dovgaluk >> Peter Crosthwaite >> Peter Crosthwaite >> Peter Crosthwaite >> +Peter Maydell >=20 > I can't find this one in git-log. $ git log -1 0d4abda8f7 commit 0d4abda8f7328c8911c1d020bb6961650eaf7801 Author: Peter Maydell AuthorDate: Fri Jul 20 13:34:49 2012 +0100 Commit: Peter Maydell CommitDate: Fri Jul 20 13:34:49 2012 +0100 hw/pl011.c: Avoid crash on read when no chr backend present >> Prasad J Pandit >> Prasad J Pandit >> Qiao Nuohan >> Reimar D=C3=B6ffinger >> Remy Noel >> +Richard Henderson >> Roger Pau Monn=C3=A9 >> Shin'ichiro Kawasaki >> Shin'ichiro Kawasaki >> +Siwei Zhuang >=20 > 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) (1): hw/riscv: Add optional symbol callback ptr to riscv_load_kernel() $ git shortlog -e 6478dd745d~..6478dd745d Siwei Zhuang (1): hw/riscv: Add optional symbol callback ptr to riscv_load_kernel() Thanks for caring checking all entries! >> +Sochin Jiang >> Sochin Jiang >> +Stefan Berger >> +Stefan Weil >> +Stefan Weil >> +Stefan Weil >> Takashi Yoshii >> Thomas Huth >> Thomas Knych >> @@ -150,6 +176,7 @@ Wenshuang Ma >> Xiaoqiang Zhao >> Xinhua Cao >> Xiong Zhang >> +Ying Fang >> Yin Yin >> yuchenlin >> YunQiang Su >