{"thread":{"id":"40239","subject":"[PATCH] mailmap: update my entry with new email address","startedAt":"2015-09-01T15:50:06Z","lastAt":"2015-09-01T17:14:10Z","messageCount":4,"participants":["Ramsay Jones","Johannes Schindelin","Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"269096","messageId":"55E5C92E.7040105@ramsayjones.plus.com","threadId":"40239","inReplyTo":null,"subject":"[PATCH] mailmap: update my entry with new email address","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2015-09-01T15:50:06Z","receivedAt":"2015-09-01T15:50:06Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"\nMy 'demon' email address is no longer functional since, after 16+\nyears with demon, I have had to change my ISP. :(\n\nAlso, take the opportunity to remove my middle name, which I only\nuse on official documents (or in the GECOS field when creating a\nuser account on unix).\n\nSigned-off-by: Ramsay Jones \n---\n\nHi Junio,\n\nSo, my home move caused a (reluctant) change in ISP too. :(\nThis, in turn, left me without any internet access for just over\nthree weeks; I was climbing the walls!\n\nATB,\nRamsay Jones\n\n .mailmap | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/.mailmap b/.mailmap\nindex ece2951..e5b4126 100644\n--- a/.mailmap\n+++ b/.mailmap\n@@ -186,7 +186,7 @@ Philip Jägenstedt \n Philipp A. Hartmann \n Philippe Bruhat \n Ralf Thielow \n-Ramsay Allan Jones \n+Ramsay Jones \n René Scharfe \n Robert Fitzsimons \n Robert Shearman \n-- \n2.5.0\n"},{"id":"269098","messageId":"01dbb6005800a8816a5f6b9ae740dbc9@www.dscho.org","threadId":"40239","inReplyTo":"55E5C92E.7040105@ramsayjones.plus.com","subject":"Re: [PATCH] mailmap: update my entry with new email address","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-09-01T16:11:24Z","receivedAt":"2015-09-01T16:11:24Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Ramsay,\n\nOn 2015-09-01 17:50, Ramsay Jones wrote:\n\n> diff --git a/.mailmap b/.mailmap\n> index ece2951..e5b4126 100644\n> --- a/.mailmap\n> +++ b/.mailmap\n> @@ -186,7 +186,7 @@ Philip Jägenstedt \n> \n> Philipp A. Hartmann \n> Philippe Bruhat \n> Ralf Thielow \n> -Ramsay Allan Jones \n> +Ramsay Jones \n> René Scharfe \n> Robert Fitzsimons \n> Robert Shearman \n\nThe idea of the .mailmap file is to fix inconsistent names in the history. For example, if you look e.g. at commit 6ebdee5af47df0c64354e452419015a694c25f5f, you will see that your middle name was recorded, but if you look e.g. at f84df81f654aeb0ac4582e0b3be162cba6ea5232 you will see that it was not always recorded with your changes.\n\nTherefore I would recommend leaving the old line in place, and just *adding* another one.\n\nBesides, for consistency I would leave the middle name in there. Otherwise, people might be wondering why their shortlog calls bring up some other name. In other words, if you add a new line, you really want to use the same clear name as before.\n\nYou actually do not even need to add a new line if you plan on submitting patches with your middle name. Remember: the main purpose of .mailmap is to support shortlog, i.e. appropriate grouping of patches by person (such as the two commits I mentioned above).\n\nCiao,\nJohannes\n\nP.S.: That's a major bummer on your three forced-offline weeks. I feel with ya!\n"},{"id":"269105","messageId":"CAGZ79kbo6vq8yvs0aMcZUX54w_CF0-=_Qqeq4VTio55ie7U0Yg@mail.gmail.com","threadId":"40239","inReplyTo":"01dbb6005800a8816a5f6b9ae740dbc9@www.dscho.org","subject":"Re: [PATCH] mailmap: update my entry with new email address","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2015-09-01T17:07:23Z","receivedAt":"2015-09-01T17:07:23Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Tue, Sep 1, 2015 at 9:11 AM, Johannes Schindelin\n wrote:\n> Hi Ramsay,\n>\n> On 2015-09-01 17:50, Ramsay Jones wrote:\n>\n>> diff --git a/.mailmap b/.mailmap\n>> index ece2951..e5b4126 100644\n>> --- a/.mailmap\n>> +++ b/.mailmap\n>> @@ -186,7 +186,7 @@ Philip Jägenstedt \n>> \n>> Philipp A. Hartmann \n>> Philippe Bruhat \n>> Ralf Thielow \n>> -Ramsay Allan Jones \n>> +Ramsay Jones \n>> René Scharfe \n>> Robert Fitzsimons \n>> Robert Shearman \n>\n> The idea of the .mailmap file is to fix inconsistent names in the history. For example, if you look e.g. at commit 6ebdee5af47df0c64354e452419015a694c25f5f, you will see that your middle name was recorded, but if you look e.g. at f84df81f654aeb0ac4582e0b3be162cba6ea5232 you will see that it was not always recorded with your changes.\n\nI would argue a mailmap file serves a dual purpose.\nThe first purpose as you said is to correct inconsistent or erroneous\nnames (who is sb@local.host anyway ?)\n\nThe second purpose is just as Ramsay used it to map different\nidentities to one person/email address.\nAs Ramsay lost his access to the email, you would want to use his new\nemail, say when looking for the right reviewer using git blame.\nThen even old commits (with the old email recorded) should rather\ndisplay the new email, such that you get it right the first time.\n\n>\n> Therefore I would recommend leaving the old line in place, and just *adding* another one.\n\nI would recommending taking this patch specifically for the second purpose.\n\n>\n> Besides, for consistency I would leave the middle name in there. Otherwise, people might be wondering why their shortlog calls bring up some other name. In other words, if you add a new line, you really want to use the same clear name as before.\n\nYou can use the long form\n Name1 Name2 \nin the .mailmap file to always show the Name1 and email1.\n\n>\n> You actually do not even need to add a new line if you plan on submitting patches with your middle name. Remember: the main purpose of .mailmap is to support shortlog, i.e. appropriate grouping of patches by person (such as the two commits I mentioned above).\n>\n> Ciao,\n> Johannes\n>\n> P.S.: That's a major bummer on your three forced-offline weeks. I feel with ya!\n\nSometimes I'd love to be offline for 3 weeks. But being forced to? No thanks!\n\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"},{"id":"269107","messageId":"55E5DCE2.8050403@ramsayjones.plus.com","threadId":"40239","inReplyTo":"01dbb6005800a8816a5f6b9ae740dbc9@www.dscho.org","subject":"Re: [PATCH] mailmap: update my entry with new email address","fromName":"Ramsay Jones","fromEmail":"ramsay@ramsayjones.plus.com","sentAt":"2015-09-01T17:14:10Z","receivedAt":"2015-09-01T17:14:10Z","isPatch":true,"sender":{"key":"ramsay@ramsayjones.plus.com","avatar":"https://avatars.githubusercontent.com/u/33702710?v=4"},"body":"Hi Johannes,\n\nOn 01/09/15 17:11, Johannes Schindelin wrote:\n> Hi Ramsay,\n>\n> On 2015-09-01 17:50, Ramsay Jones wrote:\n>\n>> diff --git a/.mailmap b/.mailmap\n>> index ece2951..e5b4126 100644\n>> --- a/.mailmap\n>> +++ b/.mailmap\n>> @@ -186,7 +186,7 @@ Philip Jägenstedt \n>> \n>> Philipp A. Hartmann \n>> Philippe Bruhat \n>> Ralf Thielow \n>> -Ramsay Allan Jones \n>> +Ramsay Jones \n>> René Scharfe \n>> Robert Fitzsimons \n>> Robert Shearman \n> The idea of the .mailmap file is to fix inconsistent names in the history. For example, if you look e.g. at commit 6ebdee5af47df0c64354e452419015a694c25f5f, you will see that your middle name was recorded, but if you look e.g. at f84df81f654aeb0ac4582e0b3be162cba6ea5232 you will see that it was not always recorded with your changes.\n\nHmm, I assume you are using 'git log' or 'git show' to look at these; try this:\n\n $ git show --use-mailmap 6ebdee5af47df0c64354e452419015a694c25f5\n $ git log -1 --use-mailmap f84df81f654aeb0ac4582e0b3be162cba6ea523\n\nor indeed, this:\n\n $ git check-mailmap \"Ramsay Allan Jones \"\n Ramsay Jones \n $\n\nAlso, 'git shortlog' seems to be working just fine. (The first few commits, which include\nmy middle name, were a mistake; back then git used to look into the GECOS field if\nyou didn't set your name in the config ...). [If it isn't clear, I don't want to see my middle\nname!]\n\nYes, I was a little surprised that '--use-mailmap' was not on by default, but then I have a\nvery vague recollection of a discussion on the list which decided otherwise. (I'm far too\nlazy to search the archives ...).\n\nATB,\nRamsay Jones\n\n>\n> Therefore I would recommend leaving the old line in place, and just *adding* another one.\n>\n> Besides, for consistency I would leave the middle name in there. Otherwise, people might be wondering why their shortlog calls bring up some other name. In other words, if you add a new line, you really want to use the same clear name as before.\n>\n> You actually do not even need to add a new line if you plan on submitting patches with your middle name. Remember: the main purpose of .mailmap is to support shortlog, i.e. appropriate grouping of patches by person (such as the two commits I mentioned above).\n>\n> Ciao,\n> Johannes\n>\n> P.S.: That's a major bummer on your three forced-offline weeks. I feel with ya!\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n>\n"}]}