Re: [PATCH v2] mailmap: update brian m. carlson's email address

[brian m. carlson]

On Tue, May 22, 2018 at 03:08:26PM -0700, Jonathan Nieder wrote:
> These commits use author Brian M. Carlson .
> Previously they matched
> 
>   brian m. carlson  
> 
> 
> but now they don't match any line in the .mailmap file.
> 
> Should we add a line
> 
>   brian m. carlson 
> 
> to handle these commits?

Ah, good point.  Probably so.
-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH v2] mailmap: update brian m. carlson's email address

[Jonathan Nieder]

Hi,

brian m. carlson wrote:

> An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to
> individual persons", 2013-08-12), noted that there were two name
> spellings and two email addresses and mapped the crustytoothpaste.net
> address to the crustytoothpaste.ath.cx address.  The latter is an older,
> obsolete address, while the former is current, so switch the order of
> the addresses so that git log displays the correct address.
>
> Signed-off-by: brian m. carlson 
> ---
> I intentionally avoided the use of the first person here, because I
> wasn't sure what the preference of the list was on that.  Hopefully it
> reads naturally and isn't awkward.

I have no preference.  First or third person would work equally well
for me for this kind of thing.

[...]
> --- a/.mailmap
> +++ b/.mailmap
> @@ -25,8 +25,8 @@ Ben Walton  
>  Benoit Sigoure  
>  Bernt Hansen  
>  Brandon Casey  
> -brian m. carlson  Brian M. Carlson 
> 
> -brian m. carlson  
> 
> +brian m. carlson  Brian M. Carlson 
> 
> +brian m. carlson  
> 

Today I tried a "git shortlog" run and was surprised to find

  Brian M. Carlson (6):
  Add missing test file for UTF-16.
  submodule: fix confusing variable name
  submodule: don't print status output with ignore=all
  send-email: don't call methods on undefined values
  http-backend: provide Allow header for 405
  remote-curl: fix large pushes with GSSAPI

These commits use author Brian M. Carlson .
Previously they matched

brian m. carlson  


but now they don't match any line in the .mailmap file.

Should we add a line

brian m. carlson 

to handle these commits?

Thanks,
Jonathan

Re: [PATCH v2] mailmap: update brian m. carlson's email address

[brian m. carlson]

On Wed, May 09, 2018 at 12:33:59PM +0530, Kaartic Sivaraam wrote:
> On Wednesday 09 May 2018 05:49 AM, brian m. carlson wrote:
> > Correct, it doesn't.  In my case, I was using --pretty='%aN <%aE>',
> > which is how I noticed it in the first place.
> 
> So, how about updating the commit message to avoid confusions to the
> incidental future reader? (Or is it just not worth it? ;-])

I don't think it's worth it.  It does apply to git log, just not unless
you enable the mailmap, which I supposed was implicit.  I can do a v3 if
someone feels strongly, but otherwise I think it's fine as it is.
-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH v2] mailmap: update brian m. carlson's email address

[Kaartic Sivaraam]

On Wednesday 09 May 2018 05:49 AM, brian m. carlson wrote:
> Correct, it doesn't.  In my case, I was using --pretty='%aN <%aE>',
> which is how I noticed it in the first place.

So, how about updating the commit message to avoid confusions to the
incidental future reader? (Or is it just not worth it? ;-])


-- 
Sivaraam



signature.asc
Description: OpenPGP digital signature

Re: [PATCH v2] mailmap: update brian m. carlson's email address

[brian m. carlson]

On Tue, May 08, 2018 at 10:34:58AM +0530, Kaartic Sivaraam wrote:
> Just to be sure, you're meaning the use of `git log --use-mailmap` when
> you mean `git log` in the log message. Am I right? Or did you mean `git
> shortlog` ?
> 
> I'm asking this because I think the `git log` output doesn't consider
> the mailmap file by default.

Correct, it doesn't.  In my case, I was using --pretty='%aN <%aE>',
which is how I noticed it in the first place.
-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

Re: [PATCH v2] mailmap: update brian m. carlson's email address

[Kaartic Sivaraam]

On Tuesday 08 May 2018 07:28 AM, brian m. carlson wrote:
> An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to
> individual persons", 2013-08-12), noted that there were two name
> spellings and two email addresses and mapped the crustytoothpaste.net
> address to the crustytoothpaste.ath.cx address.  The latter is an older,
> obsolete address, while the former is current, so switch the order of
> the addresses so that git log displays the correct address.
> 
Just to be sure, you're meaning the use of `git log --use-mailmap` when
you mean `git log` in the log message. Am I right? Or did you mean `git
shortlog` ?

I'm asking this because I think the `git log` output doesn't consider
the mailmap file by default.

-- 
Sivaraam

QUOTE:

“The most valuable person on any team is the person who makes everyone
else on the team more valuable, not the person who knows the most.”

  - Joel Spolsky


Sivaraam?

You possibly might have noticed that my signature recently changed from
'Kaartic' to 'Sivaraam' both of which are parts of my name. I find the
new signature to be better for several reasons one of which is that the
former signature has a lot of ambiguities in the place I live as it is a
common name (NOTE: it's not a common spelling, just a common name). So,
I switched signatures before it's too late.

That said, I won't mind you calling me 'Kaartic' if you like it [of
course ;-)]. You can always call me using either of the names.


KIND NOTE TO THE NATIVE ENGLISH SPEAKER:

As I'm not a native English speaker myself, there might be mistaeks in
my usage of English. I apologise for any mistakes that I make.

It would be "helpful" if you take the time to point out the mistakes.

It would be "super helpful" if you could provide suggestions about how
to correct those mistakes.

Thanks in advance!



signature.asc
Description: OpenPGP digital signature

Re: [PATCH v2] mailmap: update brian m. carlson's email address

[Junio C Hamano]

"brian m. carlson"  writes:

> An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to
> individual persons", 2013-08-12), noted that there were two name
> spellings and two email addresses and mapped the crustytoothpaste.net
> address to the crustytoothpaste.ath.cx address.  The latter is an older,
> obsolete address, while the former is current, so switch the order of
> the addresses so that git log displays the correct address.
>
> Signed-off-by: brian m. carlson 
> ---
> I intentionally avoided the use of the first person here, because I
> wasn't sure what the preference of the list was on that.  Hopefully it
> reads naturally and isn't awkward.
>
> If not, I can send a v3.

Nah, the updated text is perfect.  Thanks, will replace.

>
>  .mailmap | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index 7c71e88ea5..df7cf6313c 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -25,8 +25,8 @@ Ben Walton  
>  Benoit Sigoure  
>  Bernt Hansen  
>  Brandon Casey  
> -brian m. carlson  Brian M. Carlson 
> 
> -brian m. carlson  
> 
> +brian m. carlson  Brian M. Carlson 
> 
> +brian m. carlson  
> 
>  Bryan Larsen  
>  Bryan Larsen  
>  Cheng Renquan 

[PATCH v2] mailmap: update brian m. carlson's email address

[brian m. carlson]

An earlier change, cdb6b5ac (".mailmap: Combine more (name, email) to
individual persons", 2013-08-12), noted that there were two name
spellings and two email addresses and mapped the crustytoothpaste.net
address to the crustytoothpaste.ath.cx address.  The latter is an older,
obsolete address, while the former is current, so switch the order of
the addresses so that git log displays the correct address.

Signed-off-by: brian m. carlson 
---
I intentionally avoided the use of the first person here, because I
wasn't sure what the preference of the list was on that.  Hopefully it
reads naturally and isn't awkward.

If not, I can send a v3.

 .mailmap | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 7c71e88ea5..df7cf6313c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,8 +25,8 @@ Ben Walton  
 Benoit Sigoure  
 Bernt Hansen  
 Brandon Casey  
-brian m. carlson  Brian M. Carlson 

-brian m. carlson  

+brian m. carlson  Brian M. Carlson 

+brian m. carlson  

 Bryan Larsen  
 Bryan Larsen  
 Cheng Renquan