{"thread":{"id":"48427","subject":"[PATCH] mailmap: update brian m. carlson's email address","startedAt":"2018-05-06T23:24:38Z","lastAt":"2018-09-25T02:13:26Z","messageCount":18,"participants":["brian m. carlson","Junio C Hamano","Stefan Beller","Kaartic Sivaraam","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"346819","messageId":"20180506232421.975789-1-sandals@crustytoothpaste.net","threadId":"48427","inReplyTo":null,"subject":"[PATCH] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-06T23:24:21Z","receivedAt":"2018-05-06T23:24:38Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"The order of addresses in the mailmap file was reversed, leading to git\npreferring the crustytoothpaste.ath.cx address, which is obsolete, over\nthe crustytoothpaste.net address, which is current. Switch the order of\nthe addresses so that git log displays the correct address.\n\nSigned-off-by: brian m. carlson \n---\n .mailmap | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex 7c71e88ea5..df7cf6313c 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -25,8 +25,8 @@ Ben Walton \n Benoit Sigoure \n Bernt Hansen \n Brandon Casey \n-brian m. carlson Brian M. Carlson \n-brian m. carlson \n+brian m. carlson Brian M. Carlson \n+brian m. carlson \n Bryan Larsen \n Bryan Larsen \n Cheng Renquan \n"},{"id":"346841","messageId":"xmqqa7tcqgpq.fsf@gitster-ct.c.googlers.com","threadId":"48427","inReplyTo":"20180506232421.975789-1-sandals@crustytoothpaste.net","subject":"Re: [PATCH] mailmap: update brian m. carlson's email address","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-05-07T03:37:05Z","receivedAt":"2018-05-07T03:37:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"brian m. carlson\" writes:\n\n> The order of addresses in the mailmap file was reversed, leading to git\n> preferring the crustytoothpaste.ath.cx address, which is obsolete, over\n> the crustytoothpaste.net address, which is current. Switch the order of\n> the addresses so that git log displays the correct address.\n>\n> Signed-off-by: brian m. carlson \n> ---\n\nI initially reacted to \"was reversed\" with \"yikes, did we break the\nmailmap reader and we need to update the file?\", but apparently that\nis not what this patch is about. I think what is happening here is\nthat cdb6b5ac (\".mailmap: Combine more (name, email) to individual\npersons\", 2013-08-12) removed\n\n-Brian M. Carlson \n\nand then added these two lines\n\n+brian m. carlson Brian M. Carlson \n+brian m. carlson \n\nwhere *.net address did not come from any other entry for you in the\nfile. I guess the author of the patch saw that you were sending\nyour messages from the .net address and tried to help by unifying\nthe two addresses, without knowing your preference and recorded two\nreversed entries.\n\nWill queue as-is for now, but if you want to update the log message\nI do not mind taking a reroll.\n\nThanks.\n\n\n> .mailmap | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/.mailmap b/.mailmap\n> index 7c71e88ea5..df7cf6313c 100644\n> --- a/.mailmap\n> +++ b/.mailmap\n> @@ -25,8 +25,8 @@ Ben Walton \n> Benoit Sigoure \n> Bernt Hansen \n> Brandon Casey \n> -brian m. carlson Brian M. Carlson \n> -brian m. carlson \n> +brian m. carlson Brian M. Carlson \n> +brian m. carlson \n> Bryan Larsen \n> Bryan Larsen \n> Cheng Renquan \n"},{"id":"346906","messageId":"CAGZ79kZXXiWrGgO-KU+afncfNTZzp=AHHJY5qZqA9qAg5YLuuQ@mail.gmail.com","threadId":"48427","inReplyTo":"xmqqa7tcqgpq.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] mailmap: update brian m. carlson's email address","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-05-07T19:25:09Z","receivedAt":"2018-05-07T19:25:14Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Sun, May 6, 2018 at 8:37 PM, Junio C Hamano wrote:\n> \"brian m. carlson\" writes:\n>\n>> The order of addresses in the mailmap file was reversed, leading to git\n>> preferring the crustytoothpaste.ath.cx address, which is obsolete, over\n>> the crustytoothpaste.net address, which is current. Switch the order of\n>> the addresses so that git log displays the correct address.\n>>\n>> Signed-off-by: brian m. carlson \n>> ---\n>\n> I initially reacted to \"was reversed\" with \"yikes, did we break the\n> mailmap reader and we need to update the file?\", but apparently that\n> is not what this patch is about. I think what is happening here is\n> that cdb6b5ac (\".mailmap: Combine more (name, email) to individual\n> persons\", 2013-08-12) removed\n>\n> -Brian M. Carlson \n>\n> and then added these two lines\n>\n> +brian m. carlson Brian M. Carlson \n> +brian m. carlson \n>\n> where *.net address did not come from any other entry for you in the\n> file. I guess the author of the patch saw that you were sending\n> your messages from the .net address and tried to help by unifying\n> the two addresses, without knowing your preference and recorded two\n> reversed entries.\n>\n> Will queue as-is for now, but if you want to update the log message\n> I do not mind taking a reroll.\n\nbrian,\n\nsorry to break you there. I was the author of the patch Junio found, organizing\nthe .mailmap file was one of my starter contributions. I recall asking all the\npeople if they were ok with it their names combined in different spellings\n94b410bba86 (.mailmap: Map email addresses to names, 2013-07-12)\nf4f49e2258a (.mailmap: Combine more (email, name) to individual\npersons, 2013-07-14)\nand I vaguley recall asking you about capitalization of your name there\nand you preferred the lower case name, but apparently I never asked you\nabout the preferred email address.\n\nSorry and thanks for fixing,\nStefan\n"},{"id":"346934","messageId":"20180507234451.GK953644@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"xmqqa7tcqgpq.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-07T23:44:51Z","receivedAt":"2018-05-07T23:44:59Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Mon, May 07, 2018 at 12:37:05PM +0900, Junio C Hamano wrote:\n> I initially reacted to \"was reversed\" with \"yikes, did we break the\n> mailmap reader and we need to update the file?\", but apparently that\n> is not what this patch is about. I think what is happening here is\n> that cdb6b5ac (\".mailmap: Combine more (name, email) to individual\n> persons\", 2013-08-12) removed\n> \n> -Brian M. Carlson \n> \n> and then added these two lines\n> \n> +brian m. carlson Brian M. Carlson \n> +brian m. carlson \n> \n> where *.net address did not come from any other entry for you in the\n> file. I guess the author of the patch saw that you were sending\n> your messages from the .net address and tried to help by unifying\n> the two addresses, without knowing your preference and recorded two\n> reversed entries.\n> \n> Will queue as-is for now, but if you want to update the log message\n> I do not mind taking a reroll.\n\nI can reroll with a less alarming commit message, sure.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"346935","messageId":"20180507235352.GL953644@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"CAGZ79kZXXiWrGgO-KU+afncfNTZzp=AHHJY5qZqA9qAg5YLuuQ@mail.gmail.com","subject":"Re: [PATCH] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-07T23:53:52Z","receivedAt":"2018-05-07T23:54:04Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Mon, May 07, 2018 at 12:25:09PM -0700, Stefan Beller wrote:\n> brian,\n> \n> sorry to break you there. I was the author of the patch Junio found, organizing\n> the .mailmap file was one of my starter contributions. I recall asking all the\n> people if they were ok with it their names combined in different spellings\n> 94b410bba86 (.mailmap: Map email addresses to names, 2013-07-12)\n> f4f49e2258a (.mailmap: Combine more (email, name) to individual\n> persons, 2013-07-14)\n> and I vaguley recall asking you about capitalization of your name there\n> and you preferred the lower case name, but apparently I never asked you\n> about the preferred email address.\n\nNot a problem. I hadn't until very recently completely understood the\nformat of the .mailmap file (in that the correct items are always to be\non the left), so I didn't think anything of it when reviewing the\ncommit. Perhaps I should come up with a patch to the documentation to\nmake it easier for past me to understand.\n\nI only recently realized that with my transition to a separate mail\nserver (in September), the crustytoothpaste.ath.cx address doesn't\nactually work, and when perusing the output of git log, realized that it\nwas the wrong way around.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"346947","messageId":"20180508015845.268572-1-sandals@crustytoothpaste.net","threadId":"48427","inReplyTo":"20180506232421.975789-1-sandals@crustytoothpaste.net","subject":"[PATCH v2] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-08T01:58:45Z","receivedAt":"2018-05-08T01:59:00Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"An earlier change, cdb6b5ac (\".mailmap: Combine more (name, email) to\nindividual persons\", 2013-08-12), noted that there were two name\nspellings and two email addresses and mapped the crustytoothpaste.net\naddress to the crustytoothpaste.ath.cx address. The latter is an older,\nobsolete address, while the former is current, so switch the order of\nthe addresses so that git log displays the correct address.\n\nSigned-off-by: brian m. carlson \n---\nI intentionally avoided the use of the first person here, because I\nwasn't sure what the preference of the list was on that. Hopefully it\nreads naturally and isn't awkward.\n\nIf not, I can send a v3.\n\n .mailmap | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex 7c71e88ea5..df7cf6313c 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -25,8 +25,8 @@ Ben Walton \n Benoit Sigoure \n Bernt Hansen \n Brandon Casey \n-brian m. carlson Brian M. Carlson \n-brian m. carlson \n+brian m. carlson Brian M. Carlson \n+brian m. carlson \n Bryan Larsen \n Bryan Larsen \n Cheng Renquan \n"},{"id":"346954","messageId":"xmqqzi1an86t.fsf@gitster-ct.c.googlers.com","threadId":"48427","inReplyTo":"20180508015845.268572-1-sandals@crustytoothpaste.net","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-05-08T03:21:46Z","receivedAt":"2018-05-08T03:21:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"brian m. carlson\" writes:\n\n> An earlier change, cdb6b5ac (\".mailmap: Combine more (name, email) to\n> individual persons\", 2013-08-12), noted that there were two name\n> spellings and two email addresses and mapped the crustytoothpaste.net\n> address to the crustytoothpaste.ath.cx address. The latter is an older,\n> obsolete address, while the former is current, so switch the order of\n> the addresses so that git log displays the correct address.\n>\n> Signed-off-by: brian m. carlson \n> ---\n> I intentionally avoided the use of the first person here, because I\n> wasn't sure what the preference of the list was on that. Hopefully it\n> reads naturally and isn't awkward.\n>\n> If not, I can send a v3.\n\nNah, the updated text is perfect. Thanks, will replace.\n\n>\n> .mailmap | 4 ++--\n> 1 file changed, 2 insertions(+), 2 deletions(-)\n>\n> diff --git a/.mailmap b/.mailmap\n> index 7c71e88ea5..df7cf6313c 100644\n> --- a/.mailmap\n> +++ b/.mailmap\n> @@ -25,8 +25,8 @@ Ben Walton \n> Benoit Sigoure \n> Bernt Hansen \n> Brandon Casey \n> -brian m. carlson Brian M. Carlson \n> -brian m. carlson \n> +brian m. carlson Brian M. Carlson \n> +brian m. carlson \n> Bryan Larsen \n> Bryan Larsen \n> Cheng Renquan \n"},{"id":"346965","messageId":"184451b4-1b34-c1f7-f9b1-0dfa63ab9506@gmail.com","threadId":"48427","inReplyTo":"20180508015845.268572-1-sandals@crustytoothpaste.net","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"Kaartic Sivaraam","fromEmail":"kaartic.sivaraam@gmail.com","sentAt":"2018-05-08T05:04:58Z","receivedAt":"2018-05-08T05:05:14Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"On Tuesday 08 May 2018 07:28 AM, brian m. carlson wrote:\n> An earlier change, cdb6b5ac (\".mailmap: Combine more (name, email) to\n> individual persons\", 2013-08-12), noted that there were two name\n> spellings and two email addresses and mapped the crustytoothpaste.net\n> address to the crustytoothpaste.ath.cx address. The latter is an older,\n> obsolete address, while the former is current, so switch the order of\n> the addresses so that git log displays the correct address.\n> \nJust to be sure, you're meaning the use of `git log --use-mailmap` when\nyou mean `git log` in the log message. Am I right? Or did you mean `git\nshortlog` ?\n\nI'm asking this because I think the `git log` output doesn't consider\nthe mailmap file by default.\n\n-- \nSivaraam\n\nQUOTE:\n\n“The most valuable person on any team is the person who makes everyone\nelse on the team more valuable, not the person who knows the most.”\n\n - Joel Spolsky\n\n\nSivaraam?\n\nYou possibly might have noticed that my signature recently changed from\n'Kaartic' to 'Sivaraam' both of which are parts of my name. I find the\nnew signature to be better for several reasons one of which is that the\nformer signature has a lot of ambiguities in the place I live as it is a\ncommon name (NOTE: it's not a common spelling, just a common name). So,\nI switched signatures before it's too late.\n\nThat said, I won't mind you calling me 'Kaartic' if you like it [of\ncourse ;-)]. You can always call me using either of the names.\n\n\nKIND NOTE TO THE NATIVE ENGLISH SPEAKER:\n\nAs I'm not a native English speaker myself, there might be mistaeks in\nmy usage of English. I apologise for any mistakes that I make.\n\nIt would be \"helpful\" if you take the time to point out the mistakes.\n\nIt would be \"super helpful\" if you could provide suggestions about how\nto correct those mistakes.\n\nThanks in advance!\n\n"},{"id":"347034","messageId":"20180509001957.GE275488@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"184451b4-1b34-c1f7-f9b1-0dfa63ab9506@gmail.com","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-09T00:19:57Z","receivedAt":"2018-05-09T00:20:06Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Tue, May 08, 2018 at 10:34:58AM +0530, Kaartic Sivaraam wrote:\n> Just to be sure, you're meaning the use of `git log --use-mailmap` when\n> you mean `git log` in the log message. Am I right? Or did you mean `git\n> shortlog` ?\n> \n> I'm asking this because I think the `git log` output doesn't consider\n> the mailmap file by default.\n\nCorrect, it doesn't. In my case, I was using --pretty='%aN <%aE>',\nwhich is how I noticed it in the first place.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"347054","messageId":"4587b2e7-6cc8-c8fe-0b2b-7ce4202197d1@gmail.com","threadId":"48427","inReplyTo":"20180509001957.GE275488@genre.crustytoothpaste.net","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"Kaartic Sivaraam","fromEmail":"kaartic.sivaraam@gmail.com","sentAt":"2018-05-09T07:03:59Z","receivedAt":"2018-05-09T07:04:10Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"On Wednesday 09 May 2018 05:49 AM, brian m. carlson wrote:\n> Correct, it doesn't. In my case, I was using --pretty='%aN <%aE>',\n> which is how I noticed it in the first place.\n\nSo, how about updating the commit message to avoid confusions to the\nincidental future reader? (Or is it just not worth it? ;-])\n\n\n-- \nSivaraam\n\n"},{"id":"347318","messageId":"20180510231304.GG275488@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"4587b2e7-6cc8-c8fe-0b2b-7ce4202197d1@gmail.com","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-10T23:13:04Z","receivedAt":"2018-05-10T23:13:17Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Wed, May 09, 2018 at 12:33:59PM +0530, Kaartic Sivaraam wrote:\n> On Wednesday 09 May 2018 05:49 AM, brian m. carlson wrote:\n> > Correct, it doesn't. In my case, I was using --pretty='%aN <%aE>',\n> > which is how I noticed it in the first place.\n> \n> So, how about updating the commit message to avoid confusions to the\n> incidental future reader? (Or is it just not worth it? ;-])\n\nI don't think it's worth it. It does apply to git log, just not unless\nyou enable the mailmap, which I supposed was implicit. I can do a v3 if\nsomeone feels strongly, but otherwise I think it's fine as it is.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"348333","messageId":"20180522220826.GP10623@aiede.svl.corp.google.com","threadId":"48427","inReplyTo":"20180508015845.268572-1-sandals@crustytoothpaste.net","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2018-05-22T22:08:26Z","receivedAt":"2018-05-22T22:08:35Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi,\n\nbrian m. carlson wrote:\n\n> An earlier change, cdb6b5ac (\".mailmap: Combine more (name, email) to\n> individual persons\", 2013-08-12), noted that there were two name\n> spellings and two email addresses and mapped the crustytoothpaste.net\n> address to the crustytoothpaste.ath.cx address. The latter is an older,\n> obsolete address, while the former is current, so switch the order of\n> the addresses so that git log displays the correct address.\n>\n> Signed-off-by: brian m. carlson \n> ---\n> I intentionally avoided the use of the first person here, because I\n> wasn't sure what the preference of the list was on that. Hopefully it\n> reads naturally and isn't awkward.\n\nI have no preference. First or third person would work equally well\nfor me for this kind of thing.\n\n[...]\n> --- a/.mailmap\n> +++ b/.mailmap\n> @@ -25,8 +25,8 @@ Ben Walton \n> Benoit Sigoure \n> Bernt Hansen \n> Brandon Casey \n> -brian m. carlson Brian M. Carlson \n> -brian m. carlson \n> +brian m. carlson Brian M. Carlson \n> +brian m. carlson \n\nToday I tried a \"git shortlog\" run and was surprised to find\n\n Brian M. Carlson (6):\n Add missing test file for UTF-16.\n submodule: fix confusing variable name\n submodule: don't print status output with ignore=all\n send-email: don't call methods on undefined values\n http-backend: provide Allow header for 405\n remote-curl: fix large pushes with GSSAPI\n\nThese commits use author Brian M. Carlson .\nPreviously they matched\n\n\tbrian m. carlson \n\nbut now they don't match any line in the .mailmap file.\n\nShould we add a line\n\n\tbrian m. carlson \n\nto handle these commits?\n\nThanks,\nJonathan\n"},{"id":"348338","messageId":"20180522224215.GI652292@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"20180522220826.GP10623@aiede.svl.corp.google.com","subject":"Re: [PATCH v2] mailmap: update brian m. carlson's email address","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-05-22T22:42:15Z","receivedAt":"2018-05-22T22:42:24Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote:\n> These commits use author Brian M. Carlson .\n> Previously they matched\n> \n> \tbrian m. carlson \n> \n> but now they don't match any line in the .mailmap file.\n> \n> Should we add a line\n> \n> \tbrian m. carlson \n> \n> to handle these commits?\n\nAh, good point. Probably so.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"358307","messageId":"20180917181800.GA140909@aiede.svl.corp.google.com","threadId":"48427","inReplyTo":"20180522224215.GI652292@genre.crustytoothpaste.net","subject":"[PATCH] mailmap: consistently normalize brian m. carlson's name","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2018-09-17T18:18:00Z","receivedAt":"2018-09-17T18:18:05Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address,\n2018-05-08) changed the mailmap to map\n\n sandals@crustytoothpaste.ath.cx\n -> brian m. carlson \n\ninstead of\n\n sandals@crustytoothpaste.net\n -> brian m. carlson \n\nThat means the mapping\n\n Brian M. Carlson \n -> brian m. carlson \n\nis redundant, so we can remove it. More importantly, it means that\nthe identity \"Brian M. Carlson \" used in\nsome commits is not normalized any more. Add a mapping for it.\n\nNoticed while updating Debian's Git packaging, which uses \"git\nshortlog --no-merges\" to produce a list of changes in each version,\ngrouped by author's (normalized) name.\n\nSigned-off-by: Jonathan Nieder \n---\nbrian m. carlson wrote:\n> On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote:\n\n>> These commits use author Brian M. Carlson .\n>> Previously they matched\n>>\n>> \tbrian m. carlson \n>>\n>> but now they don't match any line in the .mailmap file.\n>>\n>> Should we add a line\n>>\n>> \tbrian m. carlson \n>>\n>> to handle these commits?\n>\n> Ah, good point. Probably so.\n\nSorry to leave this hanging for so long. How about this patch?\n\nThanks,\nJonathan\n\n .mailmap | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex f165222a78..29047a110a 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -25,7 +25,7 @@ Ben Walton \n Benoit Sigoure \n Bernt Hansen \n Brandon Casey \n-brian m. carlson Brian M. Carlson \n+brian m. carlson Brian M. Carlson \n brian m. carlson \n Bryan Larsen \n Bryan Larsen \n-- \n2.19.0.397.gdd90340f6a\n\n"},{"id":"358357","messageId":"20180917222158.GY432229@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"20180917181800.GA140909@aiede.svl.corp.google.com","subject":"Re: [PATCH] mailmap: consistently normalize brian m. carlson's name","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-09-17T22:21:58Z","receivedAt":"2018-09-17T22:22:06Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Mon, Sep 17, 2018 at 11:18:00AM -0700, Jonathan Nieder wrote:\n> v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address,\n> 2018-05-08) changed the mailmap to map\n> \n> sandals@crustytoothpaste.ath.cx\n> -> brian m. carlson \n> \n> instead of\n> \n> sandals@crustytoothpaste.net\n> -> brian m. carlson \n> \n> That means the mapping\n> \n> Brian M. Carlson \n> -> brian m. carlson \n> \n> is redundant, so we can remove it. More importantly, it means that\n> the identity \"Brian M. Carlson \" used in\n> some commits is not normalized any more. Add a mapping for it.\n> \n> Noticed while updating Debian's Git packaging, which uses \"git\n> shortlog --no-merges\" to produce a list of changes in each version,\n> grouped by author's (normalized) name.\n\nI think this commit message makes sense. I apparently still fail to\nunderstand how the .mailmap format works, so I can't tell you if the\npatch is correct.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"358767","messageId":"20180924173902.GB138072@aiede.svl.corp.google.com","threadId":"48427","inReplyTo":"20180917222158.GY432229@genre.crustytoothpaste.net","subject":"[PATCH v2] mailmap: consistently normalize brian m. carlson's name","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2018-09-24T17:39:02Z","receivedAt":"2018-09-24T17:39:08Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"v2.18.0-rc0~70^2 (mailmap: update brian m. carlson's email address,\n2018-05-08) changed the mailmap to map\n\n sandals@crustytoothpaste.ath.cx\n -> brian m. carlson \n\ninstead of\n\n sandals@crustytoothpaste.net\n -> brian m. carlson \n\nThat means the mapping\n\n Brian M. Carlson \n -> brian m. carlson \n\nis redundant, so we can remove it. More importantly, it means that\nthe identity \"Brian M. Carlson \" used in\nsome commits is not normalized any more. Add a mapping for it.\n\nNoticed while updating Debian's Git packaging, which uses \"git\nshortlog --no-merges\" to produce a list of changes in each version,\ngrouped by author's (normalized) name.\n\nSigned-off-by: Jonathan Nieder \n---\nHi,\n\nbrian m. carlson wrote:\n\n> I think this commit message makes sense. I apparently still fail to\n> understand how the .mailmap format works, so I can't tell you if the\n> patch is correct.\n\nThanks for looking it over. What would it take to make the patch make\nsense, too? ;-)\n\nMost mailmap entries are of the form\n\n\tSome Name \n\nwhich means \"Wherever you see the email address someemail@example.com,\ncanonicalize the author's name to Some Name\". We can use that:\n\n\tbrian m. carlson \n\nWhen we see sandals@crustytoothpaste.ath.cx, we also want to\ncanonicalize the email address. For that, we can do\n\n\tbrian m. carlson \n\nThere's only one person who has used these email addresses, so we\ndon't have to do matching by name. If we wanted to tighten the name\nnormalization to match by name, I think we'd do something like\n\n\tbrian m. carlson Brian M. Carlson\n\nbut I can't get that to seem to have any effect when I test with the\n\"git check-mailmap\" command --- for example, \"git check-mailmap 'Dana\nHow '\" does not map and \"git check-mailmap\n'Random Name '\" maps to 'Dana L. How\n'.\n\nThe even tighter matching used in v1\n\n\tbrian m. carlson Brian M. Carlson \n\ndoes work, but it's unnecessary complexity. We don't need it.\n\nHow about this?\n\nChanges since v1:\n- loosened the matching to only look at email and ignore name\n- no other changes\n\n .mailmap | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex f165222a78..bef3352b0d 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -25,7 +25,7 @@ Ben Walton \n Benoit Sigoure \n Bernt Hansen \n Brandon Casey \n-brian m. carlson Brian M. Carlson \n+brian m. carlson \n brian m. carlson \n Bryan Larsen \n Bryan Larsen \n-- \n2.19.0.444.g18242da7ef\n\n"},{"id":"358812","messageId":"20180925011547.GG432229@genre.crustytoothpaste.net","threadId":"48427","inReplyTo":"20180924173902.GB138072@aiede.svl.corp.google.com","subject":"Re: [PATCH v2] mailmap: consistently normalize brian m. carlson's name","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2018-09-25T01:15:47Z","receivedAt":"2018-09-25T01:16:01Z","isPatch":true,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Mon, Sep 24, 2018 at 10:39:02AM -0700, Jonathan Nieder wrote:\n> Hi,\n> \n> brian m. carlson wrote:\n> \n> > I think this commit message makes sense. I apparently still fail to\n> > understand how the .mailmap format works, so I can't tell you if the\n> > patch is correct.\n> \n> Thanks for looking it over. What would it take to make the patch make\n> sense, too? ;-)\n\nI certainly didn't mean to imply a failing on your part for explaining\nthe change adequately. I've just always found the format confusing and\nI know others do, too.\n\n> Most mailmap entries are of the form\n> \n> \tSome Name \n> \n> which means \"Wherever you see the email address someemail@example.com,\n> canonicalize the author's name to Some Name\". We can use that:\n> \n> \tbrian m. carlson \n> \n> When we see sandals@crustytoothpaste.ath.cx, we also want to\n> canonicalize the email address. For that, we can do\n> \n> \tbrian m. carlson \n> \n> There's only one person who has used these email addresses, so we\n> don't have to do matching by name. If we wanted to tighten the name\n> normalization to match by name, I think we'd do something like\n> \n> \tbrian m. carlson Brian M. Carlson\n> \n> but I can't get that to seem to have any effect when I test with the\n> \"git check-mailmap\" command --- for example, \"git check-mailmap 'Dana\n> How '\" does not map and \"git check-mailmap\n> 'Random Name '\" maps to 'Dana L. How\n> '.\n> \n> The even tighter matching used in v1\n> \n> \tbrian m. carlson Brian M. Carlson \n> \n> does work, but it's unnecessary complexity. We don't need it.\n\nThis has been a really helpful explanation. Thanks.\n\nMaybe I'll have some time over the next week or so to send a patch to\nthe documentation to make it more understandable to past me.\n\n> How about this?\n> \n> Changes since v1:\n> - loosened the matching to only look at email and ignore name\n> - no other changes\n> \n> .mailmap | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n> \n> diff --git a/.mailmap b/.mailmap\n> index f165222a78..bef3352b0d 100644\n> --- a/.mailmap\n> +++ b/.mailmap\n> @@ -25,7 +25,7 @@ Ben Walton \n> Benoit Sigoure \n> Bernt Hansen \n> Brandon Casey \n> -brian m. carlson Brian M. Carlson \n> +brian m. carlson \n> brian m. carlson \n> Bryan Larsen \n> Bryan Larsen \n\nHaving read your explanation, this looks good. Thanks for fixing this.\n-- \nbrian m. carlson: Houston, Texas, US\nOpenPGP: https://keybase.io/bk2204\n"},{"id":"358814","messageId":"20180925021320.GQ138072@aiede.svl.corp.google.com","threadId":"48427","inReplyTo":"20180925011547.GG432229@genre.crustytoothpaste.net","subject":"Re: [PATCH v2] mailmap: consistently normalize brian m. carlson's name","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2018-09-25T02:13:20Z","receivedAt":"2018-09-25T02:13:26Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"brian m. carlson wrote:\n> On Mon, Sep 24, 2018 at 10:39:02AM -0700, Jonathan Nieder wrote:\n>> brian m. carlson wrote:\n\n>>> I think this commit message makes sense.\n[...]\n>> What would it take to make the patch make\n>> sense, too? ;-)\n>\n> I certainly didn't mean to imply a failing on your part for explaining\n> the change adequately. I've just always found the format confusing and\n> I know others do, too.\n\nNo worries. I took the opportunity because the patch isn't in \"next\"\nyet so I was looking for a way to nudge it forward. I think v2 is\nsimpler than v1. Thanks for your help.\n\n[...]\n> This has been a really helpful explanation. Thanks.\n>\n> Maybe I'll have some time over the next week or so to send a patch to\n> the documentation to make it more understandable to past me.\n\nSounds good. I think the (non-)handling of the 'name name'\ncase is likely to be a bug.\n\n>> How about this?\n[...]\n> Having read your explanation, this looks good. Thanks for fixing this.\n\n\\o/ Thanks for looking it over.\n\nSincerely,\nJonathan\n"}]}