From patchwork Mon Sep 24 17:39:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Nieder X-Patchwork-Id: 10612735 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7149E6CB for ; Mon, 24 Sep 2018 17:39:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 626AB296E8 for ; Mon, 24 Sep 2018 17:39:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 563D129888; Mon, 24 Sep 2018 17:39:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1737296E8 for ; Mon, 24 Sep 2018 17:39:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728236AbeIXXmW (ORCPT ); Mon, 24 Sep 2018 19:42:22 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:35959 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726157AbeIXXmW (ORCPT ); Mon, 24 Sep 2018 19:42:22 -0400 Received: by mail-pf1-f196.google.com with SMTP id b7-v6so1910479pfo.3 for ; Mon, 24 Sep 2018 10:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=ZfRPiEBzLMQDnROY+IbE3e59UX3AlLgWGvc/6Pp80hE=; b=IVxQVjDXu+/Koku5r2t2ucusFH8aF0+U1uPi6oLgqv9koRSY5MRdj84SPjDW5ynP+P 7d276/IGaMDFs9eijVp4DiqbMQmdtl3CKE12qodd3mavfhEo0mNqgqEcxmbZesIlUmOe q9S05x0UQaxEo3rhx8Nzax/6NrsXBnM2rx/klLPCBlqp/8IVSaFeJ4RroQLfTIF4JCy9 Fb8WRf4QKLpYdPupF6w2QnoJDP2tb8GoG83BC2CdCdeaYaeL4z5T3LvLbpbqGKAAQKh4 fdPey89uxEixjN7uFje7RD89fQWkmzBA+2pI35TsM8fLntpCBt4Yv3tBcIH26gBGFENt jZeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=ZfRPiEBzLMQDnROY+IbE3e59UX3AlLgWGvc/6Pp80hE=; b=p91n7U4cY3zloIIGvswmCpkqlEOQ7TV2JPaMPh5RbDRMKWZuaLdmLKE1w/KPkgQta7 Y5IMpmnHN1mrXbB7bYprLKLKiVq/5hg0+3Pv6TMcBB5Pni7NddAIhEn7FYT/SBKEvqBc wbRm8qGxnuH57XBmUd/q+fbSmmF6uMjvgKs6rj22H1m9POTBK5EI7Pwtg8+XSFdV2pfZ ccnAizlxxA8Q4TQqi35mDxTaWLoV39B8hOpaGC19MF3cAxaWv6U9PuHzJu+/C3WcyUXn lCkMUUyGj8cLTthIw8O1BLZiX05NRd1i2wZc9goqTUixYcbHlcrLA4L9d0uvjKTFO7tv AP3A== X-Gm-Message-State: ABuFfojM55+9OAxSvBYdDFnHPASHgqcOFFS/ZGbRnjexO6CMHWluqobA WuUjXf5mZTGXsIviSv5w0HI= X-Google-Smtp-Source: ACcGV60XIAhi0EyjbEbP8hdSYrVQxaLwOXLI+zPBVsuKB7RVE0ICdMnaSEOVBhnGKag1OvTBWG/pkQ== X-Received: by 2002:a63:4716:: with SMTP id u22-v6mr8876298pga.95.1537810746137; Mon, 24 Sep 2018 10:39:06 -0700 (PDT) Received: from aiede.svl.corp.google.com ([2620:0:100e:422:4187:1d6c:d3d6:9ce6]) by smtp.gmail.com with ESMTPSA id a11-v6sm7223757pgv.29.2018.09.24.10.39.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Sep 2018 10:39:05 -0700 (PDT) Date: Mon, 24 Sep 2018 10:39:02 -0700 From: Jonathan Nieder To: "brian m. carlson" Cc: Junio C Hamano , git@vger.kernel.org Subject: [PATCH v2] mailmap: consistently normalize brian m. carlson's name Message-ID: <20180924173902.GB138072@aiede.svl.corp.google.com> References: <20180506232421.975789-1-sandals@crustytoothpaste.net> <20180508015845.268572-1-sandals@crustytoothpaste.net> <20180522220826.GP10623@aiede.svl.corp.google.com> <20180522224215.GI652292@genre.crustytoothpaste.net> <20180917181800.GA140909@aiede.svl.corp.google.com> <20180917222158.GY432229@genre.crustytoothpaste.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180917222158.GY432229@genre.crustytoothpaste.net> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address, 2018-05-08) changed the mailmap to map sandals@crustytoothpaste.ath.cx -> brian m. carlson instead of sandals@crustytoothpaste.net -> brian m. carlson That means the mapping Brian M. Carlson -> brian m. carlson is redundant, so we can remove it. More importantly, it means that the identity "Brian M. Carlson " used in some commits is not normalized any more. Add a mapping for it. Noticed while updating Debian's Git packaging, which uses "git shortlog --no-merges" to produce a list of changes in each version, grouped by author's (normalized) name. Signed-off-by: Jonathan Nieder --- Hi, brian m. carlson wrote: > I think this commit message makes sense. I apparently still fail to > understand how the .mailmap format works, so I can't tell you if the > patch is correct. Thanks for looking it over. What would it take to make the patch make sense, too? ;-) Most mailmap entries are of the form Some Name which means "Wherever you see the email address someemail@example.com, canonicalize the author's name to Some Name". We can use that: brian m. carlson When we see sandals@crustytoothpaste.ath.cx, we also want to canonicalize the email address. For that, we can do brian m. carlson There's only one person who has used these email addresses, so we don't have to do matching by name. If we wanted to tighten the name normalization to match by name, I think we'd do something like brian m. carlson Brian M. Carlson but I can't get that to seem to have any effect when I test with the "git check-mailmap" command --- for example, "git check-mailmap 'Dana How '" does not map and "git check-mailmap 'Random Name '" maps to 'Dana L. How '. The even tighter matching used in v1 brian m. carlson Brian M. Carlson does work, but it's unnecessary complexity. We don't need it. How about this? Changes since v1: - loosened the matching to only look at email and ignore name - no other changes .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index f165222a78..bef3352b0d 100644 --- a/.mailmap +++ b/.mailmap @@ -25,7 +25,7 @@ Ben Walton Benoit Sigoure Bernt Hansen Brandon Casey -brian m. carlson Brian M. Carlson +brian m. carlson brian m. carlson Bryan Larsen Bryan Larsen