| Message ID | 20180917181800.GA140909@aiede.svl.corp.google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mailmap: consistently normalize brian m. carlson's name | expand |
On Mon, Sep 17, 2018 at 11:18:00AM -0700, Jonathan Nieder wrote: > 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 <sandals@crustytoothpaste.net> > > instead of > > sandals@crustytoothpaste.net > -> brian m. carlson <sandals@crustytoothpaste.ath.cx> > > That means the mapping > > Brian M. Carlson <sandals@crustytoothpaste.ath.cx> > -> brian m. carlson <sandals@crustytoothpaste.net> > > is redundant, so we can remove it. More importantly, it means that > the identity "Brian M. Carlson <sandals@crustytoothpaste.net>" 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. 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.
diff --git a/.mailmap b/.mailmap index f165222a78..29047a110a 100644 --- a/.mailmap +++ b/.mailmap @@ -25,7 +25,7 @@ Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca> Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr> Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca> Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil> -brian m. carlson <sandals@crustytoothpaste.net> Brian M. Carlson <sandals@crustytoothpaste.ath.cx> +brian m. carlson <sandals@crustytoothpaste.net> Brian M. Carlson <sandals@crustytoothpaste.net> brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx> Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com> Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
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 <sandals@crustytoothpaste.net> instead of sandals@crustytoothpaste.net -> brian m. carlson <sandals@crustytoothpaste.ath.cx> That means the mapping Brian M. Carlson <sandals@crustytoothpaste.ath.cx> -> brian m. carlson <sandals@crustytoothpaste.net> is redundant, so we can remove it. More importantly, it means that the identity "Brian M. Carlson <sandals@crustytoothpaste.net>" 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 <jrnieder@gmail.com> --- brian m. carlson wrote: > On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote: >> These commits use author Brian M. Carlson <sandals@crustytoothpaste.net>. >> Previously they matched >> >> brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net> >> >> but now they don't match any line in the .mailmap file. >> >> Should we add a line >> >> brian m. carlson <sandals@crustytoothpaste.net> >> >> to handle these commits? > > Ah, good point. Probably so. Sorry to leave this hanging for so long. How about this patch? Thanks, Jonathan .mailmap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)