diff mbox series

[FFmpeg-devel] Add .mailmap

Message ID 20200222211834.15970-1-josh@itanimul.li
State New
Headers show
Series [FFmpeg-devel] Add .mailmap
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Josh de Kock Feb. 22, 2020, 9:18 p.m. UTC
This allows for easy shortlog/log parsing, useful in determining
eligible members of the general assembly for the new FFmpeg voting
system.

Signed-off-by: Josh de Kock <josh@itanimul.li>
---

This list was automatically generated based off of commits from
people with the same names. If you want this adjusted/your
mapping added in this commit then please comment.

 .mailmap | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .mailmap

Comments

Jean-Baptiste Kempf Feb. 23, 2020, 2:12 p.m. UTC | #1
Yo,

On Sat, Feb 22, 2020, at 22:18, Josh de Kock wrote:
> This allows for easy shortlog/log parsing, useful in determining
> eligible members of the general assembly for the new FFmpeg voting
> system.

I think this is a good idea.
But are you sure all of those are in the right order? (aka preferred email is shown)
Josh de Kock Feb. 23, 2020, 2:22 p.m. UTC | #2
On Sun, Feb 23, 2020, at 2:12 PM, Jean-Baptiste Kempf wrote:
> [...]
>
> I think this is a good idea.
> But are you sure all of those are in the right order? (aka preferred 
> email is shown)

It looks mostly right to me, of course individuals will need to manually
verify it for themselves (but it can always be changed later).
James Darnley Feb. 23, 2020, 2:36 p.m. UTC | #3
On 2020-02-23 15:12, Jean-Baptiste Kempf wrote:
> Yo,
> 
> On Sat, Feb 22, 2020, at 22:18, Josh de Kock wrote:
>> This allows for easy shortlog/log parsing, useful in determining
>> eligible members of the general assembly for the new FFmpeg voting
>> system.
> 
> I think this is a good idea.
> But are you sure all of those are in the right order? (aka preferred email is shown)
> 

What is "preferred email" when you have 2 roles?  My commits on the job
get obe.tv (or are supposed to) and ones made in my own time get
gmail.com (or are supposed to).

Is it: when you screw up what email should you be shouted at on?

I guess since I probably send more discussion email from gmail.com,
maybe it is that one.
Josh de Kock Feb. 23, 2020, 2:54 p.m. UTC | #4
On Sun, Feb 23, 2020, at 2:36 PM, James Darnley wrote:
> [...]
> 
> What is "preferred email" when you have 2 roles?  My commits on the job
> get obe.tv (or are supposed to) and ones made in my own time get
> gmail.com (or are supposed to).
> 
> Is it: when you screw up what email should you be shouted at on?
> 
> I guess since I probably send more discussion email from gmail.com,
> maybe it is that one.

It's if you want your two emails to be associated. If you don't
associate them and you don't get >20 commits in the last 36
months on either individually then you won't be eligible for the
general assembly. You can still see which commits are on each
email (since this is important for copyright reasons).

It is just a visual thing: I will swap your association to show
your gmail email first.
Thilo Borgmann Feb. 23, 2020, 4:07 p.m. UTC | #5
Am 22.02.20 um 22:18 schrieb Josh de Kock:
> This allows for easy shortlog/log parsing, useful in determining
> eligible members of the general assembly for the new FFmpeg voting
> system.
> 
> Signed-off-by: Josh de Kock <josh@itanimul.li>
> ---
> 
> This list was automatically generated based off of commits from
> people with the same names. If you want this adjusted/your
> mapping added in this commit then please comment.

How is it automatically generated?

-Thilo

> 
>  .mailmap | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
>  create mode 100644 .mailmap
> 
> diff --git a/.mailmap b/.mailmap
> new file mode 100644
> index 0000000000..347d3f1a9d
> --- /dev/null
> +++ b/.mailmap
> @@ -0,0 +1,16 @@
> +<jdarnley@obe.tv> <james.darnley@gmail.com>
> +<jeebjp@gmail.com> <jan.ekstrom@aminocom.com>
> +<sw@jkqxz.net> <mrt@jkqxz.net>
> +<u@pkh.me> <cboesch@gopro.com>
> +<zhilizhao@tencent.com> <quinkblack@foxmail.com> <wantlamy@gmail.com>
> +<modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
> +<stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
> +<barryjzhao@tencent.com> <mypopydev@gmail.com> <jun.zhao@intel.com>
> +<josh@itanimul.li> <joshdk@obe.tv>
> +<michael@niedermayer.cc> <michaelni@gmx.at>
> +<linjie.fu@intel.com> <fulinjie@zju.edu.cn>
> +<ceffmpeg@gmail.com> <cehoyos@ag.or.at>
> +<ffmpeg@gyani.pro> <gyandoshi@gmail.com>
> +<atomnuker@gmail.com> <rpehlivanov@obe.tv>
> +<zhong.li@intel.com> <zhongli_dev@126.com>
> +<andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>
>
Josh de Kock Feb. 23, 2020, 8:40 p.m. UTC | #6
On Sun, Feb 23, 2020, at 4:07 PM, Thilo Borgmann wrote:
> [...]
> 
> How is it automatically generated?

I wrote a small script to parse author names/emails and group
emails together based on names. In the future, additions should
be added manually.
Steven Liu Feb. 24, 2020, 2:03 a.m. UTC | #7
> 2020年2月24日 上午4:40,Josh de Kock <josh@itanimul.li> 写道:
> 
> On Sun, Feb 23, 2020, at 4:07 PM, Thilo Borgmann wrote:
>> [...]
>> 
>> How is it automatically generated?
> 
> I wrote a small script to parse author names/emails and group
> emails together based on names. In the future, additions should
> be added manually.
> 
How can I get the script :D

Thanks

Steven
Thilo Borgmann Feb. 24, 2020, 11:19 a.m. UTC | #8
Am 23.02.20 um 21:40 schrieb Josh de Kock:
> On Sun, Feb 23, 2020, at 4:07 PM, Thilo Borgmann wrote:
>> [...]
>>
>> How is it automatically generated?
> 
> I wrote a small script to parse author names/emails and group
> emails together based on names. In the future, additions should
> be added manually.

Having that script in tools/ shouldn't hurt, manual updates can get out of sync.
Also authors might be unaware of or forgetting about .mailmap.

If you scriptify the group of people for a general assembly like specified during.... some earlier meeting, that should be committed, too.

.mailmap patch itself LGTM.

Thanks,
Thilo
Josh de Kock Feb. 26, 2020, 4:27 p.m. UTC | #9
Hi Steven,

On Mon, Feb 24, 2020, at 2:03 AM, Steven Liu wrote:
> [...]
> How can I get the script :D
> 
> Thanks
> 
> Steven

I won't be looking to upstream this script (the other one yes), but I will
share it here for you. You'll have to excuse my poor scripting :)
Josh de Kock Feb. 27, 2020, 12:52 a.m. UTC | #10
On Mon, Feb 24, 2020, at 11:19 AM, Thilo Borgmann wrote:
> Am 23.02.20 um 21:40 schrieb Josh de Kock:
> > On Sun, Feb 23, 2020, at 4:07 PM, Thilo Borgmann wrote:
> >> [...]
> >>
> >> How is it automatically generated?
> > 
> > I wrote a small script to parse author names/emails and group
> > emails together based on names. In the future, additions should
> > be added manually.
> 
> Having that script in tools/ shouldn't hurt, manual updates can get out of sync.
> Also authors might be unaware of or forgetting about .mailmap.
> 
> If you scriptify the group of people for a general assembly like 
> specified during.... some earlier meeting, that should be committed, 
> too.
> 
> .mailmap patch itself LGTM.

Pushed.

I will send a patch to add the script to compute the general assembly soon.
diff mbox series

Patch

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..347d3f1a9d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@ 
+<jdarnley@obe.tv> <james.darnley@gmail.com>
+<jeebjp@gmail.com> <jan.ekstrom@aminocom.com>
+<sw@jkqxz.net> <mrt@jkqxz.net>
+<u@pkh.me> <cboesch@gopro.com>
+<zhilizhao@tencent.com> <quinkblack@foxmail.com> <wantlamy@gmail.com>
+<modmaker@google.com> <modmaker-at-google.com@ffmpeg.org>
+<stebbins@jetheaddev.com> <jstebbins@jetheaddev.com>
+<barryjzhao@tencent.com> <mypopydev@gmail.com> <jun.zhao@intel.com>
+<josh@itanimul.li> <joshdk@obe.tv>
+<michael@niedermayer.cc> <michaelni@gmx.at>
+<linjie.fu@intel.com> <fulinjie@zju.edu.cn>
+<ceffmpeg@gmail.com> <cehoyos@ag.or.at>
+<ffmpeg@gyani.pro> <gyandoshi@gmail.com>
+<atomnuker@gmail.com> <rpehlivanov@obe.tv>
+<zhong.li@intel.com> <zhongli_dev@126.com>
+<andreas.rheinhardt@gmail.com> <andreas.rheinhardt@googlemail.com>