Re: [PATCH] .mailmap: fix erroneous authorship for Derrick Stolee

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 28, 2020, 17:56 UTC
Message-ID: <xmqqy2tr8ny9.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <6bcdfa906b6f1ea2296ade8c0b7eaf0c4540d681.1580156690.git.liu.denton@gmail.com>

Denton Liu <liu.denton@gmail.com> writes:

Show 11 quoted lines

> In 4c6c7971e0 (unpack-trees: correctly compute result count,
> 2020-01-10), the commit author is listed as "Derrick Stolee via
> GitGitGadget <gitgitgadget@gmail.com>", however this authorship is
> erroneous. Fix the authorship by mapping the erroneous authorship to
> Derrick Stolee's canonical authorship information.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> Whoops, I didn't realise that the branch had already been merged into
> 'next'. Anyway, we can apply this mailmap patch on the tip of
> 'ds/sparse-cone' to fix that issue.

Thanks, but that was also a bit too late, in that I queued an equivalent already.

Thanks for reading our log with extra care.

Show 15 quoted lines

>  .mailmap | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/.mailmap b/.mailmap
> index 14fa041043..cf3f68ecaf 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -59,6 +59,7 @@ 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>
>  Deskin Miller <deskinm@umich.edu>
>  Dirk Süsserott <newsletter@dirk.my1.cc>
>  Eric Blake <eblake@redhat.com> <ebb9@byu.net>