Re: [PATCH 2/3] .mailmap: assume Jason McMullan to be the same person

2018-06-29 Thread Junio C Hamano
Stefan Beller  writes:

> Over the years of contributing to open source, I realized the world of
> open source is smaller than I originally thought and a name is still
> a pretty unique thing. So let's assume these two author idents are the
> same person.
>
> In 10813e0d3c7 (.mailmap: update long-lost friends with multiple defunct
> addresses, 2013-08-12) we learned both their email bounce, so asking is
> no option.

True, but leaving them as-is is probably a better option in such a
case.  Until we get new contribution from the same person, at which
time we have the chance we've been awaiting to ask the question, it
is not harming anybody to keep these two names as if they are two
different people.

> Signed-off-by: Stefan Beller 
> ---
>  .mailmap | 5 +
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index f165222a782..ff96ef7401f 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -82,10 +82,7 @@ J. Bruce Fields  
> 
>  J. Bruce Fields  
>  Jakub Narębski 
>  James Y Knight  
> -# The 2 following authors are probably the same person,
> -# but both emails bounce.
> -Jason McMullan 
> -Jason McMullan 
> +Jason McMullan  Jason McMullan 
> 
>  Jason Riedy  
>  Jason Riedy  
>  Jay Soffian  


[PATCH 2/3] .mailmap: assume Jason McMullan to be the same person

2018-06-28 Thread Stefan Beller
Over the years of contributing to open source, I realized the world of
open source is smaller than I originally thought and a name is still
a pretty unique thing. So let's assume these two author idents are the
same person.

In 10813e0d3c7 (.mailmap: update long-lost friends with multiple defunct
addresses, 2013-08-12) we learned both their email bounce, so asking is
no option.

Signed-off-by: Stefan Beller 
---
 .mailmap | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index f165222a782..ff96ef7401f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -82,10 +82,7 @@ J. Bruce Fields  

 J. Bruce Fields  
 Jakub Narębski 
 James Y Knight  
-# The 2 following authors are probably the same person,
-# but both emails bounce.
-Jason McMullan 
-Jason McMullan 
+Jason McMullan  Jason McMullan 

 Jason Riedy  
 Jason Riedy  
 Jay Soffian  
-- 
2.18.0.399.gad0ab374a1-goog