Re: [PATCH] mailmap: update brian m. carlson's email address
- From
Stefan Beller <sbeller@google.com>
- Date
- May 7, 2018, 19:25 UTC
- Message-ID
- <CAGZ79kZXXiWrGgO-KU+afncfNTZzp=AHHJY5qZqA9qAg5YLuuQ@mail.gmail.com>
- In-Reply-To
- <xmqqa7tcqgpq.fsf@gitster-ct.c.googlers.com>
On Sun, May 6, 2018 at 8:37 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 31 quoted lines
> "brian m. carlson" <sandals@crustytoothpaste.net> writes:
>
>> The order of addresses in the mailmap file was reversed, leading to git
>> preferring the crustytoothpaste.ath.cx address, which is obsolete, over
>> the crustytoothpaste.net address, which is current. Switch the order of
>> the addresses so that git log displays the correct address.
>>
>> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
>> ---
>
> I initially reacted to "was reversed" with "yikes, did we break the
> mailmap reader and we need to update the file?", but apparently that
> is not what this patch is about. I think what is happening here is
> that cdb6b5ac (".mailmap: Combine more (name, email) to individual
> persons", 2013-08-12) removed
>
> -Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
>
> and then added these two lines
>
> +brian m. carlson <sandals@crustytoothpaste.ath.cx> Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
> +brian m. carlson <sandals@crustytoothpaste.ath.cx> <sandals@crustytoothpaste.net>
>
> where *.net address did not come from any other entry for you in the
> file. I guess the author of the patch saw that you were sending
> your messages from the .net address and tried to help by unifying
> the two addresses, without knowing your preference and recorded two
> reversed entries.
>
> Will queue as-is for now, but if you want to update the log message
> I do not mind taking a reroll.brian,
sorry to break you there. I was the author of the patch Junio found, organizing the .mailmap file was one of my starter contributions. I recall asking all the people if they were ok with it their names combined in different spellings 94b410bba86 (.mailmap: Map email addresses to names, 2013-07-12) f4f49e2258a (.mailmap: Combine more (email, name) to individual persons, 2013-07-14) and I vaguley recall asking you about capitalization of your name there and you preferred the lower case name, but apparently I never asked you about the preferred email address.
Sorry and thanks for fixing, Stefan