From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BAADC2D0DB for ; Tue, 28 Jan 2020 17:56:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 06F442173E for ; Tue, 28 Jan 2020 17:56:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=pobox.com header.i=@pobox.com header.b="rq/ypioz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726676AbgA1R4T (ORCPT ); Tue, 28 Jan 2020 12:56:19 -0500 Received: from pb-smtp21.pobox.com ([173.228.157.53]:51506 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726276AbgA1R4T (ORCPT ); Tue, 28 Jan 2020 12:56:19 -0500 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 2A8B9BE5C8; Tue, 28 Jan 2020 12:56:19 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; s=sasl; bh=sPFwmVeWgyZD h/EenCXhhSMYbhs=; b=rq/ypioz1KEQFBDhjx2i70+vilAoZ8zXNq9H+2S/8Npq CW4gZ7OV4FgPrMvXlcXhoeHill8E9Z1Y2RDUuUBkc4qjT93E+rPJj3BccvKtAv6y XErxBtDvuyLjsTrwemiBh71QFZmNV84HtMROsCMyhPpnYo/svqLB00ogumNyKh4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=sasl; b=vtxlYU fsfdFagfyndAsuylOyCwFgpdngeA7vHA1blfwMi9SpamVHAtojtQK+h+LUTziKBr XDec95uv7Nr5ZcPgOwViUaFTWw00GPfqdPVc186Ge6Lk5lZbuXuKVlfUvRFf3RLT ToNShI4JFZXiImxme3TEyQyTn9x062p72KrJQ= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 2267EBE5C7; Tue, 28 Jan 2020 12:56:19 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.76.80.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 4D1B0BE5C6; Tue, 28 Jan 2020 12:56:16 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Denton Liu Cc: Git Mailing List Subject: Re: [PATCH] .mailmap: fix erroneous authorship for Derrick Stolee References: <6bcdfa906b6f1ea2296ade8c0b7eaf0c4540d681.1580156690.git.liu.denton@gmail.com> Date: Tue, 28 Jan 2020 09:56:14 -0800 In-Reply-To: <6bcdfa906b6f1ea2296ade8c0b7eaf0c4540d681.1580156690.git.liu.denton@gmail.com> (Denton Liu's message of "Mon, 27 Jan 2020 15:26:38 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 X-Pobox-Relay-ID: 7AED1AB2-41F7-11EA-B86B-8D86F504CC47-77302942!pb-smtp21.pobox.com Content-Transfer-Encoding: quoted-printable Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Denton Liu writes: > In 4c6c7971e0 (unpack-trees: correctly compute result count, > 2020-01-10), the commit author is listed as "Derrick Stolee via > GitGitGadget ", 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 > --- > 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. > .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 > David Turner > David Turner > Derrick Stolee > +Derrick Stolee Derrick Stolee via GitGitGadget= > Deskin Miller > Dirk S=C3=BCsserott > Eric Blake