* [Qemu-devel] [PATCH v1 1/8] contrib/gitdm: filetype interface is not in order, fix
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 13:34 ` Aleksandar Markovic
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 2/8] contrib/gitdm: Add armbru@pond.sub.org to group-map-redhat Alex Bennée
` (6 subsequent siblings)
7 siblings, 1 reply; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée, Markus Armbruster
From: Markus Armbruster <armbru@redhat.com>
gitm prints the rather cryptic message "interface not found, appended
to the last order". This is because filetypes.txt has filetype
interface, but neglects to mention it in order. Fix that.
Fixes: 2f28271d807edfcdc47a280c06999dd866dcae10
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190822122350.29852-2-armbru@redhat.com>
---
contrib/gitdm/filetypes.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
index 165b71b3f9a..2d5002fea0c 100644
--- a/contrib/gitdm/filetypes.txt
+++ b/contrib/gitdm/filetypes.txt
@@ -34,7 +34,7 @@
# If there is an filetype which is not in order but has values, it will
# be added at the end.
#
-order build,tests,code,documentation,devel-doc,blobs
+order build,interface,tests,code,documentation,devel-doc,blobs
#
#
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v1 1/8] contrib/gitdm: filetype interface is not in order, fix
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 1/8] contrib/gitdm: filetype interface is not in order, fix Alex Bennée
@ 2019-08-28 13:34 ` Aleksandar Markovic
0 siblings, 0 replies; 12+ messages in thread
From: Aleksandar Markovic @ 2019-08-28 13:34 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel, Markus Armbruster
28.08.2019. 14.09, "Alex Bennée" <alex.bennee@linaro.org> је написао/ла:
>
> From: Markus Armbruster <armbru@redhat.com>
>
> gitm prints the rather cryptic message "interface not found, appended
> to the last order". This is because filetypes.txt has filetype
> interface, but neglects to mention it in order. Fix that.
>
> Fixes: 2f28271d807edfcdc47a280c06999dd866dcae10
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> Message-Id: <20190822122350.29852-2-armbru@redhat.com>
> ---
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> contrib/gitdm/filetypes.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/gitdm/filetypes.txt b/contrib/gitdm/filetypes.txt
> index 165b71b3f9a..2d5002fea0c 100644
> --- a/contrib/gitdm/filetypes.txt
> +++ b/contrib/gitdm/filetypes.txt
> @@ -34,7 +34,7 @@
> # If there is an filetype which is not in order but has values, it will
> # be added at the end.
> #
> -order build,tests,code,documentation,devel-doc,blobs
> +order build,interface,tests,code,documentation,devel-doc,blobs
>
> #
> #
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH v1 2/8] contrib/gitdm: Add armbru@pond.sub.org to group-map-redhat
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 1/8] contrib/gitdm: filetype interface is not in order, fix Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 3/8] mailmap: Reorder by sections Alex Bennée
` (5 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée, Markus Armbruster
From: Markus Armbruster <armbru@redhat.com>
Just to get the (few) accidental uses of my private e-mail address
attributed correctly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190822122350.29852-3-armbru@redhat.com>
---
contrib/gitdm/group-map-redhat | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/gitdm/group-map-redhat b/contrib/gitdm/group-map-redhat
index 6d05c6b54fd..d15db2d35e1 100644
--- a/contrib/gitdm/group-map-redhat
+++ b/contrib/gitdm/group-map-redhat
@@ -5,3 +5,4 @@
david@gibson.dropbear.id.au
laurent@vivier.eu
pjp@fedoraproject.org
+armbru@pond.sub.org
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v1 3/8] mailmap: Reorder by sections
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 1/8] contrib/gitdm: filetype interface is not in order, fix Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 2/8] contrib/gitdm: Add armbru@pond.sub.org to group-map-redhat Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 4/8] mailmap: Update philmd email address Alex Bennée
` (4 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Philippe Mathieu-Daudé,
Aleksandar Markovic
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Our mailmap currently has 4 sections somehow documented.
Reorder few entries not related to "addresses from the original
git import" into the 3rd section, and add a comment to describe
it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20190822230916.576-2-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.mailmap | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/.mailmap b/.mailmap
index b8e08297c90..e1fdc88d25d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,20 +4,12 @@
# into proper addresses so that they are counted properly by git shortlog.
Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
-Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
-James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
-Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
-Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
-Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
-Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
-Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
-Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
@@ -32,6 +24,15 @@ Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu
Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
+# Next, replace old addresses by a more recent one.
+Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
+James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
+Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
+Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
+Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
+Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
+Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
+Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
# Also list preferred name forms where people have changed their
# git author config, or had utf8/latin1 encoding issues.
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v1 4/8] mailmap: Update philmd email address
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
` (2 preceding siblings ...)
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 3/8] mailmap: Reorder by sections Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 5/8] mailmap: Add many entries to improve 'git shortlog' statistics Alex Bennée
` (3 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel
Cc: Alex Bennée, Daniel P . Berrangé,
Philippe Mathieu-Daudé, Aleksandar Markovic
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Use the email address where I spend most of my time.
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20190822230916.576-3-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.mailmap | 1 +
1 file changed, 1 insertion(+)
diff --git a/.mailmap b/.mailmap
index e1fdc88d25d..e68ddd26e67 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
+Philippe Mathieu-Daudé <philmd@redhat.com> <f4bug@amsat.org>
Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
# Also list preferred name forms where people have changed their
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v1 5/8] mailmap: Add many entries to improve 'git shortlog' statistics
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
` (3 preceding siblings ...)
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 4/8] mailmap: Update philmd email address Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary Alex Bennée
` (2 subsequent siblings)
7 siblings, 0 replies; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
All of these emails have a least 1 commit with utf8/latin1 encoding
issue, or one with no author name.
When there are multiple commits, keep the author name the most used.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190822230916.576-4-philmd@redhat.com>
---
.mailmap | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/.mailmap b/.mailmap
index e68ddd26e67..d0fc1d793c6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -37,5 +37,110 @@ Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
# Also list preferred name forms where people have changed their
# git author config, or had utf8/latin1 encoding issues.
+Aaron Lindsay <aaron@os.amperecomputing.com>
+Alexey Gerasimenko <x1917x@gmail.com>
+Alex Ivanov <void@aleksoft.net>
+Andreas Färber <afaerber@suse.de>
+Bandan Das <bsd@redhat.com>
+Benjamin MARSILI <mlspirat42@gmail.com>
+Benoît Canet <benoit.canet@gmail.com>
+Benoît Canet <benoit.canet@irqsave.net>
+Benoît Canet <benoit.canet@nodalink.com>
+Boqun Feng <boqun.feng@gmail.com>
+Boqun Feng <boqun.feng@intel.com>
+Brad Smith <brad@comstyle.com>
+Brijesh Singh <brijesh.singh@amd.com>
+Brilly Wu <brillywu@viatech.com.cn>
+Cédric Vincent <cedric.vincent@st.com>
+CheneyLin <linzc@zju.edu.cn>
+Chen Gang <chengang@emindsoft.com.cn>
+Chen Gang <gang.chen.5i5j@gmail.com>
+Chen Gang <gang.chen@sunrus.com.cn>
+Chen Wei-Ren <chenwj@iis.sinica.edu.tw>
+Christophe Lyon <christophe.lyon@st.com>
+Collin L. Walling <walling@linux.ibm.com>
Daniel P. Berrangé <berrange@redhat.com>
+Eduardo Otubo <otubo@redhat.com>
+Fabrice Desclaux <fabrice.desclaux@cea.fr>
+Fernando Luis Vázquez Cao <fernando_b1@lab.ntt.co.jp>
+Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>
+Gautham R. Shenoy <ego@in.ibm.com>
+Gautham R. Shenoy <ego@linux.vnet.ibm.com>
+Gonglei (Arei) <arei.gonglei@huawei.com>
+Guang Wang <wang.guang55@zte.com.cn>
+Hailiang Zhang <zhang.zhanghailiang@huawei.com>
+Hervé Poussineau <hpoussin@reactos.org>
+Jakub Jermář <jakub@jermar.eu>
+Jakub Jermář <jakub.jermar@kernkonzept.com>
+Jean-Christophe Dubois <jcd@tribudubois.net>
+Jindřich Makovička <makovick@gmail.com>
+John Arbuckle <programmingkidx@gmail.com>
+Juha Riihimäki <juha.riihimaki@nokia.com>
+Juha Riihimäki <Juha.Riihimaki@nokia.com>
+Jun Li <junmuzi@gmail.com>
+Laurent Vivier <Laurent@lvivier.info>
+Leandro Lupori <leandro.lupori@gmail.com>
+Li Guang <lig.fnst@cn.fujitsu.com>
+Liming Wang <walimisdev@gmail.com>
+linzhecheng <linzc@zju.edu.cn>
+Liran Schour <lirans@il.ibm.com>
+Liu Yu <yu.liu@freescale.com>
+Liu Yu <Yu.Liu@freescale.com>
+Li Zhang <zhlcindy@gmail.com>
+Li Zhang <zhlcindy@linux.vnet.ibm.com>
+Lluís Vilanova <vilanova@ac.upc.edu>
+Lluís Vilanova <xscript@gmx.net>
+Longpeng (Mike) <longpeng2@huawei.com>
+Luc Michel <luc.michel@git.antfield.fr>
+Luc Michel <luc.michel@greensocs.com>
+Marc Marí <marc.mari.barcelo@gmail.com>
+Marc Marí <markmb@redhat.com>
+Michael Avdienko <whitearchey@gmail.com>
+Michael S. Tsirkin <mst@redhat.com>
+Munkyu Im <munkyu.im@samsung.com>
+Nicholas Bellinger <nab@linux-iscsi.org>
+Nicholas Thomas <nick@bytemark.co.uk>
+Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
+Orit Wasserman <owasserm@redhat.com>
+Paolo Bonzini <pbonzini@redhat.com>
+Pavel Dovgaluk <dovgaluk@ispras.ru>
+Pavel Dovgaluk <pavel.dovgaluk@gmail.com>
+Pavel Dovgaluk <Pavel.Dovgaluk@ispras.ru>
+Peter Crosthwaite <crosthwaite.peter@gmail.com>
+Peter Crosthwaite <peter.crosthwaite@petalogix.com>
+Peter Crosthwaite <peter.crosthwaite@xilinx.com>
+Prasad J Pandit <pjp@fedoraproject.org>
+Prasad J Pandit <ppandit@redhat.com>
+Qiao Nuohan <qiaonuohan@cn.fujitsu.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+Remy Noel <remy.noel@blade-group.com>
+Roger Pau Monné <roger.pau@citrix.com>
+Shin'ichiro Kawasaki <kawasaki@juno.dti.ne.jp>
+Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
+Sochin Jiang <sochin.jiang@huawei.com>
+Takashi Yoshii <takasi-y@ops.dti.ne.jp>
+Thomas Huth <thuth@redhat.com>
+Thomas Knych <thomaswk@google.com>
+Timothy Baldwin <T.E.Baldwin99@members.leeds.ac.uk>
+Tony Nguyen <tony.nguyen@bt.com>
+Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
+Vibi Sreenivasan <vibi_sreenivasan@cms.com>
+Vijaya Kumar K <vijayak@cavium.com>
+Vijaya Kumar K <Vijaya.Kumar@cavium.com>
+Vijay Kumar <vijaykumar@bravegnu.org>
+Vijay Kumar <vijaykumar@zilogic.com>
+Wang Guang <wang.guang55@zte.com.cn>
+Wenchao Xia <xiawenc@linux.vnet.ibm.com>
+Wenshuang Ma <kevinnma@tencent.com>
+Xiaoqiang Zhao <zxq_yx_007@163.com>
+Xinhua Cao <caoxinhua@huawei.com>
+Xiong Zhang <xiong.y.zhang@intel.com>
+Yin Yin <yin.yin@cs2c.com.cn>
+yuchenlin <npes87184@gmail.com>
+YunQiang Su <syq@debian.org>
+YunQiang Su <ysu@wavecomp.com>
+Yuri Pudgorodskiy <yur@virtuozzo.com>
+Zhengui Li <lizhengui@huawei.com>
+Zhenwei Pi <pizhenwei@bytedance.com>
+Zhenwei Pi <zhenwei.pi@youruncloud.com>
+Zhuang Yanying <ann.zhuangyanying@huawei.com>
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
` (4 preceding siblings ...)
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 5/8] mailmap: Add many entries to improve 'git shortlog' statistics Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 13:31 ` Aleksandar Markovic
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 7/8] contrib/gitdm: add RT-RK to domain-map Alex Bennée
2019-08-28 14:58 ` [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
7 siblings, 1 reply; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée
The two files are not interchangeable but a change to one *might*
require a change to the other so lets flag that up with an explanation
of what both files are trying to achieve. While we are at it document
the many forms .mailmap can take in the header.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.mailmap | 14 ++++++++++++++
contrib/gitdm/aliases | 20 ++++++++++++++++++--
contrib/gitdm/group-map-individuals | 3 ++-
3 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/.mailmap b/.mailmap
index d0fc1d793c6..0756a0bf66d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,18 @@
# This mailmap fixes up author names/addresses.
+#
+# If you are adding to this file consider if a similar change needs to
+# be made to contrib/gitdm/aliases. They are not however completely
+# analogous. .mailmap is concerned with fixing up damaged author
+# fields where as the gitdm equivalent is more concerned with making
+# sure multiple email addresses get mapped onto the same author.
+#
+# From man git-shortlog the forms are:
+#
+# Proper Name <commit@email.xx>
+# <proper@email.xx> <commit@email.xx>
+# Proper Name <proper@email.xx> <commit@email.xx>
+# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
+#
# The first section translates weird addresses from the original git import
# into proper addresses so that they are counted properly by git shortlog.
diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases
index 07fd3391a56..c1e744312f5 100644
--- a/contrib/gitdm/aliases
+++ b/contrib/gitdm/aliases
@@ -1,6 +1,22 @@
#
-# This is the email aliases file, mapping secondary addresses
-# onto a single, canonical address. Duplicates some info from .mailmap
+# This is the email aliases file, mapping secondary addresses onto a
+# single, canonical address. It duplicates some info from .mailmap so
+# if you are adding something here also consider if the .mailmap needs
+# updating.
+#
+# If you just want to avoid gitdm complaining about author fields
+# which are actually email addresses with the message:
+#
+# "...is an author name, probably not what you want"
+#
+# you can just apply --use-mailmap to you git-log command, e.g:
+#
+# git log --use-mailmap --numstat --since "last 2 years" | $GITDM
+#
+# however that will have the effect of squashing multiple addresses to
+# a canonical address which will distort the stats of those who
+# contribute in both personal and professional capacities from
+# different addresses.
#
# weird commits
diff --git a/contrib/gitdm/group-map-individuals b/contrib/gitdm/group-map-individuals
index 05e355d30ec..1c847174380 100644
--- a/contrib/gitdm/group-map-individuals
+++ b/contrib/gitdm/group-map-individuals
@@ -2,7 +2,8 @@
# Individual and personal contributors
#
# This is simply to allow prolific developers with no company
-# affiliations to be grouped together in the summary stats.
+# affiliations (or non-company related personal work) to be grouped
+# together in the summary stats.
#
f4bug@amsat.org
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary Alex Bennée
@ 2019-08-28 13:31 ` Aleksandar Markovic
0 siblings, 0 replies; 12+ messages in thread
From: Aleksandar Markovic @ 2019-08-28 13:31 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel
28.08.2019. 14.22, "Alex Bennée" <alex.bennee@linaro.org> је написао/ла:
>
> The two files are not interchangeable but a change to one *might*
> require a change to the other so lets flag that up with an explanation
> of what both files are trying to achieve. While we are at it document
> the many forms .mailmap can take in the header.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
> .mailmap | 14 ++++++++++++++
> contrib/gitdm/aliases | 20 ++++++++++++++++++--
> contrib/gitdm/group-map-individuals | 3 ++-
> 3 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index d0fc1d793c6..0756a0bf66d 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -1,4 +1,18 @@
> # This mailmap fixes up author names/addresses.
> +#
> +# If you are adding to this file consider if a similar change needs to
> +# be made to contrib/gitdm/aliases. They are not however completely
> +# analogous. .mailmap is concerned with fixing up damaged author
> +# fields where as the gitdm equivalent is more concerned with making
> +# sure multiple email addresses get mapped onto the same author.
> +#
> +# From man git-shortlog the forms are:
> +#
> +# Proper Name <commit@email.xx>
> +# <proper@email.xx> <commit@email.xx>
> +# Proper Name <proper@email.xx> <commit@email.xx>
> +# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
> +#
>
> # The first section translates weird addresses from the original git
import
> # into proper addresses so that they are counted properly by git
shortlog.
> diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases
> index 07fd3391a56..c1e744312f5 100644
> --- a/contrib/gitdm/aliases
> +++ b/contrib/gitdm/aliases
> @@ -1,6 +1,22 @@
> #
> -# This is the email aliases file, mapping secondary addresses
> -# onto a single, canonical address. Duplicates some info from .mailmap
> +# This is the email aliases file, mapping secondary addresses onto a
> +# single, canonical address. It duplicates some info from .mailmap so
> +# if you are adding something here also consider if the .mailmap needs
> +# updating.
> +#
> +# If you just want to avoid gitdm complaining about author fields
> +# which are actually email addresses with the message:
> +#
> +# "...is an author name, probably not what you want"
> +#
> +# you can just apply --use-mailmap to you git-log command, e.g:
> +#
> +# git log --use-mailmap --numstat --since "last 2 years" | $GITDM
> +#
> +# however that will have the effect of squashing multiple addresses to
> +# a canonical address which will distort the stats of those who
> +# contribute in both personal and professional capacities from
> +# different addresses.
> #
>
> # weird commits
> diff --git a/contrib/gitdm/group-map-individuals
b/contrib/gitdm/group-map-individuals
> index 05e355d30ec..1c847174380 100644
> --- a/contrib/gitdm/group-map-individuals
> +++ b/contrib/gitdm/group-map-individuals
> @@ -2,7 +2,8 @@
> # Individual and personal contributors
> #
> # This is simply to allow prolific developers with no company
> -# affiliations to be grouped together in the summary stats.
> +# affiliations (or non-company related personal work) to be grouped
> +# together in the summary stats.
> #
>
> f4bug@amsat.org
> --
> 2.20.1
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Qemu-devel] [PATCH v1 7/8] contrib/gitdm: add RT-RK to domain-map
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
` (5 preceding siblings ...)
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary Alex Bennée
@ 2019-08-28 12:08 ` Alex Bennée
2019-08-28 14:58 ` [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
7 siblings, 0 replies; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 12:08 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Brankovic, Alex Bennée, Mateja Marjanovic
I added this because Mateja is showing up in the top 10 stats for the
last year. I have noticed a bunch of the Wavecomp guys have been
sending messages from RT-RK but I'm assuming they are different
entities.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Cc: Stefan Brankovic <stefan.brankovic@rt-rk.com>
Cc: Mateja Marjanovic <mateja.marjanovic@rt-rk.com>
---
contrib/gitdm/domain-map | 1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/gitdm/domain-map b/contrib/gitdm/domain-map
index fa9d454473d..abee7e334b4 100644
--- a/contrib/gitdm/domain-map
+++ b/contrib/gitdm/domain-map
@@ -18,6 +18,7 @@ nokia.com Nokia
oracle.com Oracle
proxmox.com Proxmox
redhat.com Red Hat
+rt-rk.com RT RK
siemens.com Siemens
sifive.com SiFive
suse.de SUSE
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates
2019-08-28 12:08 [Qemu-devel] [PATCH v1 0/8] various gitdm and mailmap updates Alex Bennée
` (6 preceding siblings ...)
2019-08-28 12:08 ` [Qemu-devel] [PATCH v1 7/8] contrib/gitdm: add RT-RK to domain-map Alex Bennée
@ 2019-08-28 14:58 ` Alex Bennée
7 siblings, 0 replies; 12+ messages in thread
From: Alex Bennée @ 2019-08-28 14:58 UTC (permalink / raw)
To: qemu-devel; +Cc: Alex Bennée
Alex Bennée <alex.bennee@linaro.org> writes:
> Hi,
>
> With another release out of the door and KVM Forum approaching it is a
> good time to clean up our gitdm stats. As usual updates for academic
> institutions and individual contributors involve a bit of guess work
> so I have CC'd those affected for their confirmation. There is also a
> large amount of verbiage added to the mailmap and aliases files to
> (hopefully) better explain what they are trying to do.
Apologies for the double post... when the initial run returned an empty
result I thought it had failed but no - it had just complained about
some utf-8 names.
>
> Alex Bennée (3):
> .mailmap/aliases: add some further commentary
> contrib/gitdm: add RT-RK to domain-map
> contrib/gitdm: add more entries individuals and academics
>
> Markus Armbruster (2):
> contrib/gitdm: filetype interface is not in order, fix
> contrib/gitdm: Add armbru@pond.sub.org to group-map-redhat
>
> Philippe Mathieu-Daudé (3):
> mailmap: Reorder by sections
> mailmap: Update philmd email address
> mailmap: Add many entries to improve 'git shortlog' statistics
>
> .mailmap | 137 ++++++++++++++++++++++++++--
> contrib/gitdm/aliases | 20 +++-
> contrib/gitdm/domain-map | 1 +
> contrib/gitdm/filetypes.txt | 2 +-
> contrib/gitdm/group-map-academics | 3 +
> contrib/gitdm/group-map-individuals | 7 +-
> contrib/gitdm/group-map-redhat | 1 +
> 7 files changed, 159 insertions(+), 12 deletions(-)
--
Alex Bennée
^ permalink raw reply [flat|nested] 12+ messages in thread