.mailmap: Add entries for inconsistent users

[zhouhao3]

Similar to opencontainers/runtime-tools#115

Before this commit:

$ git shortlog -se 
  
     5  Aleksa Sarai <[email protected]>
     1  Aleksa Sarai <[email protected]>
  ...
    38  Brandon Philips <[email protected]>
     1  Brandon Philips <[email protected]>
  ...
     3  Doug Davis <[email protected]>
     1  Doug Davis <[email protected]>
  ...
     3  Sergiusz Urbaniak <[email protected]>
    15  Sergiusz Urbaniak <[email protected]>
  ...
    27  Stephen Day <[email protected]>
    15  Stephen J Day <[email protected]>
 ...
     3  xiekeyang <[email protected]>
    18  xiekeyang <[email protected]>

Signed-off-by: zhouhao [email protected]

[wking]

49c1a7b looks good to me. I think you also want entries like:

Aleksa Sarai <[email protected]> <[email protected]>
Stephen J Day <[email protected]> <[email protected]>
xiekeyang <[email protected]> <[email protected]>
Zhou Hao <[email protected]>

To cover cases where the user isn't using --no-merges. Non-merge author information is usually more reliable than merge author information, so --no-merges is useful for deciding which form to prefer, but we want to unify author entries on merge commits too.

[wking]

From your PR comment, @xiekeyang uses the Huawei address more frequently than the Google address. He might prefer you swap the order of addresses here to make the Huawei address canonical.

Similarly with @s-urbaniak in the line above. You have the CoreOS address as more common, but the line above is making the Google address canonical. And again for the @philips line.

Anyhow, the email these folks consider canonical is up to them, and we can always adjust the canonical choice if we hear from them later, but I'd have guessed a few of them the other way around ;).

[zhouhao3]

updated. Thanks.

[wking]

From your initial comment, @stevvooe uses “Stephen J Day” for his Docker address. That's why I suggested:

Stephen J Day <[email protected]> <[email protected]>

Without the “J”, you get:

$ git describe
v0.2.0-43-g380a18c
$ git shortlog -se | grep Stephen
    27  Stephen Day <[email protected]>
    15  Stephen J Day <[email protected]>

With the line I suggest you get:

$ git shortlog -se | grep Stephen
    42  Stephen J Day <[email protected]>

[wking]

I think you still want an additional line for [email protected]. As it stands you get:

$ git describe 
v0.2.0-43-g380a18c
$ git shortlog -se | grep xiekeyang
    21  xiekeyang <[email protected]>
    22  xiekeyang <[email protected]>

With an additional line you can collapse those together:

$ ENTRIES=$(echo 'xiekeyang <[email protected]> <[email protected]>'; cat .mailmap)
$ echo "${ENTRIES}" | sort --ignore-case | uniq >.mailmap
$ git shortlog -se | grep xiekeyang
    43  xiekeyang <[email protected]>

[zhouhao3]

Done.

[wking]

I don't think this two-commit-emails syntax is supported (I don't see it discussed in git-shortlog(1) anyway). So I'm getting:

$ git --version
git version 2.1.0.60.g85f0837
$ git describe
v0.2.0-43-gb76b86e
$ git shortlog -se | grep keyang
    21  xiekeyang <[email protected]>
    22  xiekeyang <[email protected]>

I think you want two entries:

xiekeyang <[email protected]> <[email protected]>
xiekeyang <[email protected]> <[email protected]>

[zhouhao3]

@coolljt0725 @xiekeyang PTAL

[coolljt0725]

LGTM