9:47 a.m.
See the commit message for patch 2/2 for more information; patch
1/2 merely addresses some minor issues in .mailmap that I spotted
while working on the gitdm configuration.
Andrea Bolognani (2):
mailmap: Remove some duplicates
gitdm: Add gitdm configuration
.mailmap | 4 ++
docs/gitdm/aliases | 25 +++++++++
docs/gitdm/companies/canonical | 11 ++++
docs/gitdm/companies/datto | 2 +
docs/gitdm/companies/dreamhost | 4 ++
docs/gitdm/companies/nec | 2 +
docs/gitdm/companies/others | 98 ++++++++++++++++++++++++++++++++++
docs/gitdm/companies/redhat | 6 +++
docs/gitdm/companies/suse | 7 +++
docs/gitdm/companies/virtuozzo | 2 +
docs/gitdm/groups/education | 17 ++++++
docs/gitdm/groups/opensource | 12 +++++
docs/gitdm/groups/unaffiliated | 83 ++++++++++++++++++++++++++++
gitdm.config | 37 +++++++++++++
14 files changed, 310 insertions(+)
create mode 100644 docs/gitdm/aliases
create mode 100644 docs/gitdm/companies/canonical
create mode 100644 docs/gitdm/companies/datto
create mode 100644 docs/gitdm/companies/dreamhost
create mode 100644 docs/gitdm/companies/nec
create mode 100644 docs/gitdm/companies/others
create mode 100644 docs/gitdm/companies/redhat
create mode 100644 docs/gitdm/companies/suse
create mode 100644 docs/gitdm/companies/virtuozzo
create mode 100644 docs/gitdm/groups/education
create mode 100644 docs/gitdm/groups/opensource
create mode 100644 docs/gitdm/groups/unaffiliated
create mode 100644 gitdm.config
--
2.21.0
9:47 a.m.
New subject: [libvirt] [PATCH 1/2] mailmap: Remove some duplicates
Fabiano Fidencio was working for Red Hat when he contributed to
libvirt, Shi Lei's non-company email address contains the company
name so it's fair to assume contribution using it were made on
company time, and Adrian Brzezinski's personal email was used
for the S-o-b while the git authorship information clearly pointed
at the company being involved.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.mailmap | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.mailmap b/.mailmap
index 311a10a8e9..2b080568bc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -43,6 +43,10 @@
<nshirokovskiy(a)virtuozzo.com> <nshirokovskiy(a)parallels.com>
<jyang(a)redhat.com> <osier(a)yunify.com>
<kkoukiou(a)redhat.com> <k.koukiou(a)googlemail.com>
+<intrigeri(a)boum.org> <intrigeri+libvirt(a)boum.org>
+<fidencio(a)redhat.com> <fabiano(a)fidencio.org>
+<shi_lei(a)massclouds.com> <shilei.massclouds(a)gmx.com>
+<adrian.brzezinski(a)eo.pl> <redhat(a)adrb.pl>
# Name consolidation:
# Preferred author spelling <preferred email>
--
2.21.0
3:51 a.m.
New subject: [libvirt] [PATCH 1/2] mailmap: Remove some duplicates
On Thu, Jun 06, 2019 at 04:47:58PM +0200, Andrea Bolognani wrote:
Fabiano Fidencio was working for Red Hat when he contributed to
libvirt, Shi Lei's non-company email address contains the company
name so it's fair to assume contribution using it were made on
company time, and Adrian Brzezinski's personal email was used
for the S-o-b while the git authorship information clearly pointed
at the company being involved.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
.mailmap | 4 ++++
1 file changed, 4 insertions(+)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
9:47 a.m.
New subject: [libvirt] [PATCH 2/2] gitdm: Add gitdm configuration
This configuration can be used by gitdm to generate reports about
libvirt development.
The goal I was working with was being able to generate a report
for every single libvirt release and having zero "email address
as company" entries; picking different commit ranges might result
in some contributions not being accounted for.
I had to make some judgement calls when the situation was not
entirely clear-cut: when in doubt, and not finding any obvious
signs of the opposite being true, I mostly ended up dumping
people in the "unaffiliated contributions" bin. If I got it
wrong, and companies want to get recognition for their sponsored
contributions to libvirt, they can send patches.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
docs/gitdm/aliases | 25 +++++++++
docs/gitdm/companies/canonical | 11 ++++
docs/gitdm/companies/datto | 2 +
docs/gitdm/companies/dreamhost | 4 ++
docs/gitdm/companies/nec | 2 +
docs/gitdm/companies/others | 98 ++++++++++++++++++++++++++++++++++
docs/gitdm/companies/redhat | 6 +++
docs/gitdm/companies/suse | 7 +++
docs/gitdm/companies/virtuozzo | 2 +
docs/gitdm/groups/education | 17 ++++++
docs/gitdm/groups/opensource | 12 +++++
docs/gitdm/groups/unaffiliated | 83 ++++++++++++++++++++++++++++
gitdm.config | 37 +++++++++++++
13 files changed, 306 insertions(+)
create mode 100644 docs/gitdm/aliases
create mode 100644 docs/gitdm/companies/canonical
create mode 100644 docs/gitdm/companies/datto
create mode 100644 docs/gitdm/companies/dreamhost
create mode 100644 docs/gitdm/companies/nec
create mode 100644 docs/gitdm/companies/others
create mode 100644 docs/gitdm/companies/redhat
create mode 100644 docs/gitdm/companies/suse
create mode 100644 docs/gitdm/companies/virtuozzo
create mode 100644 docs/gitdm/groups/education
create mode 100644 docs/gitdm/groups/opensource
create mode 100644 docs/gitdm/groups/unaffiliated
create mode 100644 gitdm.config
diff --git a/docs/gitdm/aliases b/docs/gitdm/aliases
new file mode 100644
index 0000000000..c3c837f89f
--- /dev/null
+++ b/docs/gitdm/aliases
@@ -0,0 +1,25 @@
+# Silly mistakes, mostly found in S-o-b or R-b tags.
+
+"jdenemar redhat com" jdenemar(a)redhat.com
+"pkrempa@redhat st.com" pkrempa(a)redhat.com
+jyang@redhat jyang(a)redhat.com
+wangjie88.huawei.com wangjie88(a)huawei.com
+
+# This is information that's already present in .mailmap, and having to
+# duplicate it is annoying. Unfortunately gitdm doesn't parse .mailmap
+# and the format is different, so we can't just point it to the file
+# either.
+
+cedric.bosdonnat(a)free.fr cbosdonnat(a)suse.com
+dan(a)berrange.com berrange(a)redhat.com
+fabiano(a)fidencio.org fidencio(a)redhat.com
+intrigeri+libvirt(a)boum.org intrigeri(a)boum.org
+jim(a)meyering.net meyering(a)redhat.com
+laine(a)laine.org laine(a)redhat.com
+redhat(a)adrb.pl adrian.brzezinski(a)eo.pl
+shilei.massclouds(a)gmx.com shi_lei(a)massclouds.com
+
+# This deviates from what's found in .mailmap, but it makes more sense as
+# far as gitdm is concerned since Jim was employed by Novell at the time.
+
+jfehlig(a)linux-ypgk.site jfehlig(a)novell.com
diff --git a/docs/gitdm/companies/canonical b/docs/gitdm/companies/canonical
new file mode 100644
index 0000000000..3e7e59331f
--- /dev/null
+++ b/docs/gitdm/companies/canonical
@@ -0,0 +1,11 @@
+canonical.com
+
+# Having an @ubuntu.com email address doesn't necessarily imply you're a
+# Canonical employer; these people, however, seemed to be employed by
+# Canonical at the time they contributed to libvirt.
+
+jamie(a)ubuntu.com
+serge.hallyn(a)ubuntu.com
+smoser(a)ubuntu.com
+soren(a)ubuntu.com
+wgrant(a)ubuntu.com
diff --git a/docs/gitdm/companies/datto b/docs/gitdm/companies/datto
new file mode 100644
index 0000000000..2c0ea6e286
--- /dev/null
+++ b/docs/gitdm/companies/datto
@@ -0,0 +1,2 @@
+datto.com
+dattobackup.com
diff --git a/docs/gitdm/companies/dreamhost b/docs/gitdm/companies/dreamhost
new file mode 100644
index 0000000000..fc97503f40
--- /dev/null
+++ b/docs/gitdm/companies/dreamhost
@@ -0,0 +1,4 @@
+dreamhost.com
+dreamhost.net
+newdream.com
+newdream.net
diff --git a/docs/gitdm/companies/nec b/docs/gitdm/companies/nec
new file mode 100644
index 0000000000..8af5e5cf9b
--- /dev/null
+++ b/docs/gitdm/companies/nec
@@ -0,0 +1,2 @@
+nec.co.jp
+nec.com
diff --git a/docs/gitdm/companies/others b/docs/gitdm/companies/others
new file mode 100644
index 0000000000..516a273605
--- /dev/null
+++ b/docs/gitdm/companies/others
@@ -0,0 +1,98 @@
+6wind.com 6WIND
+active.by ActiveCloud
+aero.org Aerospace
+akamai.com Akamai
+amd.com AMD
+anchor.net.au Anchor
+aristanetworks.com Arista Networks
+arpnetworks.com ARP Networks
+av-test.de AV-TEST
+b1-systems.de B1 Systems
+brightbox.co.uk Brightbox
+cisco.com Cisco
+citrix.com Citrix
+cloudwatt.com Cloudwatt
+codethink.co.uk Codethink
+cumulusnetworks.com Cumulus Networks
+datagravity.com DataGravity
+dell.com Dell
+diateam.net DIATEAM
+eldorado.org.br ELDORADO
+endocode.com Endocode
+eo.pl eo Networks
+ericsson.com Ericsson
+fb.com Facebook
+firewall-services.com Firewall-Services
+freescale.com Freescale
+fujitsu.com Fujitsu
+gluster.com Gluster
+gridcentric.ca Gridcentric
+h3c.com H3C
+hde.co.jp HDE
+hds.com Hitachi Data Systems
+hitachi.com Hitachi
+hoster-ok.com hoster-ok.com
+hp.com HP
+huawei.com Huawei
+ibm.com IBM
+inktank.com Inktank Storage
+intel.com Intel
+intellilink.co.jp NTT DATA INTELLILINK
+invisiblethingslab.com Invisible Things Lab
+jtan.com JTAN
+juniper.net Juniper Networks
+laposte.net La Poste
+le.com Le.com
+linaro.org Linaro
+linutronix.de Linutronix
+linux2go.dk Linux2Go
+liquidweb.com Liquid Web
+massclouds.com MassClouds
+mdvirt(a)designassembly.de Coffee-Break-Games
+mellanox.com Mellanox
+midokura.com Midokura
+mirantis.com Mirantis
+munzinger.de Munzinger Archiv
+netease.com NetEase
+netzquadrat.de [netzquadrat]
+nicira.com Nicira
+nimboxx.com NIMBOXX
+novell.com Novell
+ntt.co.jp NTT Group
+ohmu.fi OHMU
+open-minds.org OpenThink
+oracle.com Oracle
+os-t.de OpenSource Training
+otb.bg Open Technologies Bulgaria
+outscale.com OUTSCALE
+parallels.com Parallels
+petalogix.com PetaLogix
+ravellosystems.com Ravello Systems
+samsung.com Samsung
+sde.cz SDE
+semihalf.com Semihalf
+siemens.com Siemens
+smartjog.com SmartJog
+solarflare.com Solarflare
+ssatr.ch Swiss Satellite Radio
+sun.com Sun Microsystems
+taobao.com Taobao
+tdf.fr TDF
+tencent.com Tencent
+transip.nl TransIP
+tresys.com Tresys
+uniudc.com Tsinghua Uniudc
+univention.de Univention
+veritas.com Veritas
+vhgroup.net VHGroup
+virtualopensystems.com Virtual Open Systems
+websense.com Websense
+wiktel.com Wikstrom Telephone Company
+windriver.com Wind River
+xmission.com XMission
+xs4all.nl XS4ALL
+yadro.com YADRO
+yandex.ru Yandex
+yunify.com Yunify
+zstack.io ZStack
+zte.com.cn ZTE
diff --git a/docs/gitdm/companies/redhat b/docs/gitdm/companies/redhat
new file mode 100644
index 0000000000..d3016619c5
--- /dev/null
+++ b/docs/gitdm/companies/redhat
@@ -0,0 +1,6 @@
+redhat.com
+
+# These Red Hat employers used their personal email address when contributing
+# to libvirt and we don't have the corresponding @redhat.com address on file.
+
+lkundrak(a)v3.sk
diff --git a/docs/gitdm/companies/suse b/docs/gitdm/companies/suse
new file mode 100644
index 0000000000..f1fe154c41
--- /dev/null
+++ b/docs/gitdm/companies/suse
@@ -0,0 +1,7 @@
+suse.com
+suse.de
+
+# These SUSE employers used their personal email address when contributing
+# to libvirt and we don't have the corresponding @suse.com address on file.
+
+olaf(a)aepfle.de
diff --git a/docs/gitdm/companies/virtuozzo b/docs/gitdm/companies/virtuozzo
new file mode 100644
index 0000000000..5e2bd44872
--- /dev/null
+++ b/docs/gitdm/companies/virtuozzo
@@ -0,0 +1,2 @@
+openvz.org
+virtuozzo.com
diff --git a/docs/gitdm/groups/education b/docs/gitdm/groups/education
new file mode 100644
index 0000000000..fe51235232
--- /dev/null
+++ b/docs/gitdm/groups/education
@@ -0,0 +1,17 @@
+byu.net
+csiro.au
+epita.fr
+hibikino.ne.jp
+infn.it
+inria.fr
+isi.edu
+nict.go.jp
+parisdescartes.fr
+telecom-bretagne.eu
+tu-berlin.de
+tu-dresden.de
+ucla.edu
+upc.edu
+utah.edu
+uvt.ro
+wide.ad.jp
diff --git a/docs/gitdm/groups/opensource b/docs/gitdm/groups/opensource
new file mode 100644
index 0000000000..0f6524e72a
--- /dev/null
+++ b/docs/gitdm/groups/opensource
@@ -0,0 +1,12 @@
+alpinelinux.org
+debian.org
+fedoraproject.org
+fsf.org
+gentoo.org
+gnome.org
+gnu.org
+kernel.org
+linux.com
+openbsd.org
+salasaga.org
+samba.org
diff --git a/docs/gitdm/groups/unaffiliated b/docs/gitdm/groups/unaffiliated
new file mode 100644
index 0000000000..f492737070
--- /dev/null
+++ b/docs/gitdm/groups/unaffiliated
@@ -0,0 +1,83 @@
+# These are all domains you can get a personal email address from, so it's
+# fair to assume people using such addresses are contributing in their spare
+# time rather than on behalf of their respective employers.
+
+126.com
+gmail.com
+gmx.com
+googlemail.com
+hotmail.com
+mail.ru
+pobox.com
+riseup.net
+web.de
+yahoo.com
+
+# Same as the above, but for domains that don't generally allow random
+# people to sign up for an email address. In this case we list the email
+# addresses directly rather than just the domain, because we can't really
+# consider the domain itself one way or the other.
+
+adam(a)pandorasboxen.com
+agx(a)sigxcpu.org
+alexander.nusov(a)nfvexpress.com
+andres(a)lagarcavilla.org
+asad.saeed(a)acidseed.com
+atler(a)pld-linux.org
+benoar(a)dolka.fr
+beorn(a)binaries.fr
+bigon(a)bigon.be
+bugzilla.redhat.simon(a)arlott.org
+cardoe(a)cardoe.com
+charles(a)dyfis.net
+d.herrendoerfer(a)herrendoerfer.name
+dan(a)danny.cz
+debfx(a)fobos.de
+eike(a)sf-mail.de
+exo(a)tty.sk
+fritz(a)fritz-elfert.de
+gene(a)czarc.net
+gordon(a)dragonsdawn.net
+heathpetersen(a)kandre.com
+ibaldo(a)adinet.com.uy
+igor47(a)moomers.org
+infos(a)nafets.de
+intrigeri(a)boum.org
+james410(a)cowgill.org.uk
+james(a)shubin.ca
+jasper(a)humppa.nl
+jeremy(a)goop.org
+jk(a)ozlabs.org
+jwm(a)horde.net
+klaus(a)ethgen.de
+lacos(a)caesar.elte.hu
+lenaic(a)lhuard.fr.eu.org
+libvirt(a)dunquino.com
+lists(a)egidy.de
+marti(a)juffo.org
+max(a)rfc2324.org
+michael(a)ellerman.id.au
+mike(a)very.puzzling.org
+n0ano(a)n0ano.com
+neil(a)aldur.co.uk
+nobody(a)nowhere.ws
+peter(a)kieser.ca
+pieter(a)hollants.com
+raimue(a)codingfarm.de
+richard(a)nod.at
+rmy(a)tigress.co.uk
+ruben(a)rubenkerkhof.com
+rufo(a)rufoa.com
+slawek(a)kaplonski.pl
+soulxu(a)soulxu-thinkpad-t410.(none)
+stybla(a)turnovfree.net
+tai(a)rakugaki.org
+thomas(a)scripty.at
+v.tolstov(a)selfip.ru
+ville.skytta(a)iki.fi
+vincent(a)bernat.im
+wido(a)widodh.nl
+wiedi(a)frubar.net
+wongc-redhat(a)hoku.net
+xschen(a)tnsoft.com.cn
+yurchor(a)ukr.net
diff --git a/gitdm.config b/gitdm.config
new file mode 100644
index 0000000000..e4101bbc34
--- /dev/null
+++ b/gitdm.config
@@ -0,0 +1,37 @@
+# gitdm config for libvirt
+# ------------------------
+#
+# Generate statistic for eg. v4.6.0 by running
+#
+# $ git log -p -M v4.5.0..v4.6.0 | gitdm
+#
+
+
+# Normalize situations where a single person uses multiple email addresses,
+# there have been mistakes, and the like.
+
+EmailAliases docs/gitdm/aliases
+
+# Most companies are easy to account for: all we need to do is list name
+# along with their domain name.
+
+EmailMap docs/gitdm/companies/others
+
+# A few companies, however, require special handling.
+
+GroupMap docs/gitdm/companies/canonical Canonical
+GroupMap docs/gitdm/companies/datto Datto
+GroupMap docs/gitdm/companies/dreamhost DreamHost
+GroupMap docs/gitdm/companies/nec NEC
+GroupMap docs/gitdm/companies/redhat Red Hat
+GroupMap docs/gitdm/companies/suse SUSE
+GroupMap docs/gitdm/companies/virtuozzo Virtuozzo
+
+# Contributors from other Open Source communities and education.
+
+GroupMap docs/gitdm/groups/opensource Contributors from Open Source communities
+GroupMap docs/gitdm/groups/education Contributors from education
+
+# Contributors that are not affiliated with any of the above.
+
+GroupMap docs/gitdm/groups/unaffiliated Unaffiliated contributors
--
2.21.0
5:10 a.m.
New subject: [libvirt] [PATCH 2/2] gitdm: Add gitdm configuration
On Thu, 2019-06-06 at 16:47 +0200, Andrea Bolognani wrote:
[...]
+++ b/docs/gitdm/companies/others
+mdvirt(a)designassembly.de Coffee-Break-Games
This should be a domain name, not an email address. I've already
fixed it locally.
--
Andrea Bolognani / Red Hat / Virtualization
5:34 a.m.
New subject: [libvirt] [PATCH 2/2] gitdm: Add gitdm configuration
On Thu, Jun 06, 2019 at 04:47:59PM +0200, Andrea Bolognani wrote:
This configuration can be used by gitdm to generate reports about
libvirt development.
The goal I was working with was being able to generate a report
for every single libvirt release and having zero "email address
as company" entries; picking different commit ranges might result
in some contributions not being accounted for.
I had to make some judgement calls when the situation was not
entirely clear-cut: when in doubt, and not finding any obvious
signs of the opposite being true, I mostly ended up dumping
people in the "unaffiliated contributions" bin. If I got it
wrong, and companies want to get recognition for their sponsored
contributions to libvirt, they can send patches.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
docs/gitdm/aliases | 25 +++++++++
docs/gitdm/companies/canonical | 11 ++++
docs/gitdm/companies/datto | 2 +
docs/gitdm/companies/dreamhost | 4 ++
docs/gitdm/companies/nec | 2 +
docs/gitdm/companies/others | 98 ++++++++++++++++++++++++++++++++++
docs/gitdm/companies/redhat | 6 +++
docs/gitdm/companies/suse | 7 +++
docs/gitdm/companies/virtuozzo | 2 +
docs/gitdm/groups/education | 17 ++++++
docs/gitdm/groups/opensource | 12 +++++
docs/gitdm/groups/unaffiliated | 83 ++++++++++++++++++++++++++++
gitdm.config | 37 +++++++++++++
13 files changed, 306 insertions(+)
create mode 100644 docs/gitdm/aliases
create mode 100644 docs/gitdm/companies/canonical
create mode 100644 docs/gitdm/companies/datto
create mode 100644 docs/gitdm/companies/dreamhost
create mode 100644 docs/gitdm/companies/nec
create mode 100644 docs/gitdm/companies/others
create mode 100644 docs/gitdm/companies/redhat
create mode 100644 docs/gitdm/companies/suse
create mode 100644 docs/gitdm/companies/virtuozzo
create mode 100644 docs/gitdm/groups/education
create mode 100644 docs/gitdm/groups/opensource
create mode 100644 docs/gitdm/groups/unaffiliated
create mode 100644 gitdm.config
diff --git a/docs/gitdm/aliases b/docs/gitdm/aliases
new file mode 100644
index 0000000000..c3c837f89f
--- /dev/null
+++ b/docs/gitdm/aliases
@@ -0,0 +1,25 @@
+# Silly mistakes, mostly found in S-o-b or R-b tags.
+
+"jdenemar redhat com" jdenemar(a)redhat.com
+"pkrempa@redhat st.com" pkrempa(a)redhat.com
+jyang@redhat jyang(a)redhat.com
+wangjie88.huawei.com wangjie88(a)huawei.com
+
+# This is information that's already present in .mailmap, and having to
+# duplicate it is annoying. Unfortunately gitdm doesn't parse .mailmap
+# and the format is different, so we can't just point it to the file
+# either.
+
Isn't the point of the files different? With .mailmap mapping multiple
addresses to one person and this file mapping it to this person's
employment?
+cedric.bosdonnat(a)free.fr cbosdonnat(a)suse.com
+dan(a)berrange.com berrange(a)redhat.com
+fabiano(a)fidencio.org fidencio(a)redhat.com
+intrigeri+libvirt(a)boum.org intrigeri(a)boum.org
+jim(a)meyering.net meyering(a)redhat.com
IIRC Jim no longer works at Red Hat
+laine(a)laine.org laine(a)redhat.com
+redhat(a)adrb.pl adrian.brzezinski(a)eo.pl
+shilei.massclouds(a)gmx.com shi_lei(a)massclouds.com
+
+# This deviates from what's found in .mailmap, but it makes more sense as
+# far as gitdm is concerned since Jim was employed by Novell at the time.
+
+jfehlig(a)linux-ypgk.site jfehlig(a)novell.com
diff --git a/docs/gitdm/companies/canonical b/docs/gitdm/companies/canonical
new file mode 100644
index 0000000000..3e7e59331f
--- /dev/null
+++ b/docs/gitdm/companies/canonical
@@ -0,0 +1,11 @@
+canonical.com
+
+# Having an @ubuntu.com email address doesn't necessarily imply you're a
+# Canonical employer; these people, however, seemed to be employed by
employee
+# Canonical at the time they contributed to libvirt.
+
+jamie(a)ubuntu.com
+serge.hallyn(a)ubuntu.com
+smoser(a)ubuntu.com
+soren(a)ubuntu.com
+wgrant(a)ubuntu.com
diff --git a/docs/gitdm/companies/redhat b/docs/gitdm/companies/redhat
new file mode 100644
index 0000000000..d3016619c5
--- /dev/null
+++ b/docs/gitdm/companies/redhat
@@ -0,0 +1,6 @@
+redhat.com
+
+# These Red Hat employers used their personal email address when contributing
employees
+# to libvirt and we don't have the corresponding @redhat.com
address on file.
+
+lkundrak(a)v3.sk
diff --git a/docs/gitdm/companies/suse b/docs/gitdm/companies/suse
new file mode 100644
index 0000000000..f1fe154c41
--- /dev/null
+++ b/docs/gitdm/companies/suse
@@ -0,0 +1,7 @@
+suse.com
+suse.de
+
+# These SUSE employers used their personal email address when contributing
employees
+# to libvirt and we don't have the corresponding @suse.com
address on file.
+
+olaf(a)aepfle.de
diff --git a/docs/gitdm/groups/unaffiliated b/docs/gitdm/groups/unaffiliated
new file mode 100644
index 0000000000..f492737070
--- /dev/null
+++ b/docs/gitdm/groups/unaffiliated
[...]
+rufo(a)rufoa.com
+slawek(a)kaplonski.pl
+soulxu(a)soulxu-thinkpad-t410.(none)
Hmm...
+stybla(a)turnovfree.net
+tai(a)rakugaki.org
+thomas(a)scripty.at
+v.tolstov(a)selfip.ru
+ville.skytta(a)iki.fi
+vincent(a)bernat.im
+wido(a)widodh.nl
+wiedi(a)frubar.net
+wongc-redhat(a)hoku.net
+xschen(a)tnsoft.com.cn
+yurchor(a)ukr.net
diff --git a/gitdm.config b/gitdm.config
new file mode 100644
index 0000000000..e4101bbc34
--- /dev/null
+++ b/gitdm.config
@@ -0,0 +1,37 @@
+# gitdm config for libvirt
+# ------------------------
+#
+# Generate statistic for eg. v4.6.0 by running
+#
+# $ git log -p -M v4.5.0..v4.6.0 | gitdm
gitdm does not seem to be packaged by distros, can you link to the git
here?
Also, I had an issue with parsing logs using dates in the ISO format,
can you add --date=rfc to the example?
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:13 a.m.
New subject: [libvirt] [PATCH 2/2] gitdm: Add gitdm configuration
On Fri, 2019-06-07 at 12:34 +0200, Ján Tomko wrote:
On Thu, Jun 06, 2019 at 04:47:59PM +0200, Andrea Bolognani wrote:
[...]
> +# This is information that's already present in .mailmap,
and having to
> +# duplicate it is annoying. Unfortunately gitdm doesn't parse .mailmap
> +# and the format is different, so we can't just point it to the file
> +# either.
Isn't the point of the files different? With .mailmap mapping multiple
addresses to one person and this file mapping it to this person's
employment?
Their purpose is only slightly different.
For .mailmap you want to ultimately end up with a single email
address associated with each physical person, so it's expected that
as the developer goes from being an unaffiliated contributor to being
employed, changes employer, and goes back to contributing in their
own time, .mailmap will be updated and consequently AUTHORS will only
reflect the current status, not the historical information. This is
okay because the generated AUTHORS is included in release tarballs,
so if you wanted to have a full view you'd only need to grab all
releases and compare them.
The gitdm configuration, on the other hand, needs to contain enough
information so that you can use it today to create reports for any
point in time in the past, which might very well involve a single
person having two or more email addresses associated with them
based on who they were working for at the time.
A perfect example of this difference is:
> +# This deviates from what's found in .mailmap, but it makes
more sense as
> +# far as gitdm is concerned since Jim was employed by Novell at the time.
> +
> +jfehlig(a)linux-ypgk.site jfehlig(a)novell.com
That said, in almost all cases these subtleties don't come into play
and the same mapping as .mailmap also applies to gitdm.
[...]
> +jim(a)meyering.net meyering(a)redhat.com
IIRC Jim no longer works at Red Hat
But he was working for Red Hat at the time he contributed to libvirt,
and he hasn't contributed since, so his contributions should show up
under "Red Hat" in the gitdm report.
[...]
> +# gitdm config for libvirt
> +# ------------------------
> +#
> +# Generate statistic for eg. v4.6.0 by running
> +#
> +# $ git log -p -M v4.5.0..v4.6.0 | gitdm
gitdm does not seem to be packaged by distros, can you link to the git
here?
Also, I had an issue with parsing logs using dates in the ISO format,
can you add --date=rfc to the example?
ACK on both counts, and I'll also fix the English mistakes you
pointed out before pushing.
Thanks for the review :)
--
Andrea Bolognani / Red Hat / Virtualization
1995
days inactive
1996
days old
6 comments
2 participants
participants (2)
-
Andrea Bolognani -
Ján Tomko