[PATCH] mailmap: change primary address for Derrick Stolee

[PATCH] mailmap: change primary address for Derrick Stolee

[Derrick Stolee via GitGitGadget]

From: Derrick Stolee <stolee@gmail.com>

The previous primary address is no longer valid.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
---
    mailmap: change primary address for Derrick Stolee

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1592%2Fderrickstolee%2Fmailmap-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1592/derrickstolee/mailmap-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1592

 .mailmap | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index dc31d70b8c1..82129be449f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,9 +59,9 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
 David Turner <novalis@novalis.org> <dturner@twopensource.com>
 David Turner <novalis@novalis.org> <dturner@twosigma.com>
-Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
-Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
-Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
+Derrick Stolee <stolee@gmail.com> <derrickstolee@github.com>
+Derrick Stolee <stolee@gmail.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <stolee@gmail.com> <dstolee@microsoft.com>
 Deskin Miller <deskinm@umich.edu>
 Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
 Dirk Süsserott <newsletter@dirk.my1.cc>

base-commit: bcb6cae2966cc407ca1afc77413b3ef11103c175
-- 
gitgitgadget

Re: [PATCH] mailmap: change primary address for Derrick Stolee

[Junio C Hamano]

[jc: removed @github.com address from CC]

"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:

> -Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
> -Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
> -Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
> +Derrick Stolee <stolee@gmail.com> <derrickstolee@github.com>
> +Derrick Stolee <stolee@gmail.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
> +Derrick Stolee <stolee@gmail.com> <dstolee@microsoft.com>

It has been irritating to see @github.com address bouncing.  Will
apply.

Thanks.

[PATCH] mailmap: change primary address for Derrick Stolee

[Derrick Stolee via GitGitGadget]

From: Derrick Stolee <derrickstolee@github.com>

Stolee transitioned from Microsoft to GitHub in July 2020, but continued
to use <dstolee@microsoft.com> because it was a valid address. He also
used <stolee@gmail.com> to communicate with the mailing list since
writing plaintext emails is difficult in Outlook. However, recent issues
with GMail delaying mailing list messages created a need to change his
primary email address.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
---
    mailmap: change primary address for Derrick Stolee
    
    As mentioned, I'm transitioning my email to my @github.com address. I
    might still use stolee@gmail.com for some old threads that aren't
    completely available in my other account.
    
    This also doesn't change any commits that were submitted before this,
    but should affect all commits that I submit afterwards.
    
    Thanks, -Stolee

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1142%2Fderrickstolee%2Fmailmap-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1142/derrickstolee/mailmap-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1142

 .mailmap | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 9c6a446bdfb..07db36a9bb9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -59,8 +59,9 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
 David S. Miller <davem@davemloft.net>
 David Turner <novalis@novalis.org> <dturner@twopensource.com>
 David Turner <novalis@novalis.org> <dturner@twosigma.com>
-Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
-Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
+Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
+Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
 Deskin Miller <deskinm@umich.edu>
 Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh
 Dirk Süsserott <newsletter@dirk.my1.cc>

base-commit: b80121027d1247a0754b3cc46897fee75c050b44
-- 
gitgitgadget

Re: [PATCH] mailmap: change primary address for Derrick Stolee

[Ævar Arnfjörð Bjarmason]

On Mon, Feb 14 2022, Derrick Stolee via GitGitGadget wrote:

> From: Derrick Stolee <derrickstolee@github.com>
>
> Stolee transitioned from Microsoft to GitHub in July 2020, but continued
> to use <dstolee@microsoft.com> because it was a valid address. He also
> used <stolee@gmail.com> to communicate with the mailing list since
> writing plaintext emails is difficult in Outlook. However, recent issues
> with GMail delaying mailing list messages created a need to change his
> primary email address.

Yeah that sucks. You might be interested in the tips I had for working
around it in
https://lore.kernel.org/git/220202.86leyt8uly.gmgdl@evledraar.gmail.com/;
and others have suggested subscribing an alias address for the GMail
address.

> diff --git a/.mailmap b/.mailmap
> index 9c6a446bdfb..07db36a9bb9 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -59,8 +59,9 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
>  David S. Miller <davem@davemloft.net>
>  David Turner <novalis@novalis.org> <dturner@twopensource.com>
>  David Turner <novalis@novalis.org> <dturner@twosigma.com>
> -Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
> -Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
> +Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
> +Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
> +Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>

FWIW I think only the addition of that last line is needed since the
.mailmap syntax supports mapping A->B, followed by B->C.

Re: [PATCH] mailmap: change primary address for Derrick Stolee

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Mon, Feb 14 2022, Derrick Stolee via GitGitGadget wrote:
>
>> From: Derrick Stolee <derrickstolee@github.com>
>>
>> Stolee transitioned from Microsoft to GitHub in July 2020, but continued
>> to use <dstolee@microsoft.com> because it was a valid address. He also
>> used <stolee@gmail.com> to communicate with the mailing list since
>> writing plaintext emails is difficult in Outlook. However, recent issues
>> with GMail delaying mailing list messages created a need to change his
>> primary email address.

"I prefer this address to be the one shown" is a good enough
justification for these entries ;-).

> Yeah that sucks. You might be interested in the tips I had for working
> around it in
> https://lore.kernel.org/git/220202.86leyt8uly.gmgdl@evledraar.gmail.com/;
> and others have suggested subscribing an alias address for the GMail
> address.
>
>> diff --git a/.mailmap b/.mailmap
>> index 9c6a446bdfb..07db36a9bb9 100644
>> --- a/.mailmap
>> +++ b/.mailmap
>> @@ -59,8 +59,9 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
>>  David S. Miller <davem@davemloft.net>
>>  David Turner <novalis@novalis.org> <dturner@twopensource.com>
>>  David Turner <novalis@novalis.org> <dturner@twosigma.com>
>> -Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
>> -Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
>> +Derrick Stolee <derrickstolee@github.com> <stolee@gmail.com>
>> +Derrick Stolee <derrickstolee@github.com> Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
>> +Derrick Stolee <derrickstolee@github.com> <dstolee@microsoft.com>
>
> FWIW I think only the addition of that last line is needed since the
> .mailmap syntax supports mapping A->B, followed by B->C.

I suspect that another reason of retiring the two entries that may
not be captured in the log message is so that people does not have
to know the person is reachable both at microsoft and github.

It is somewhat sad that we need to carry these "via GitGitGadget"
entries in the file, but we are fortunate that the mailmap supports
the "differentiate two authors with the same e-mail with the human
readable name" feature so that we can label v2.25.0~3^2 and
v2.25.1~20^2~1 with the rigth authors.  If my counting is correct,
these two are the only ones that we mistakenly made GGG as the
author of a change.