Re: [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary

[Aleksandar Markovic]

28.08.2019. 14.22, "Alex Bennée" <address@hidden> је написао/ла:
>
> The two files are not interchangeable but a change to one *might*
> require a change to the other so lets flag that up with an explanation
> of what both files are trying to achieve. While we are at it document
> the many forms .mailmap can take in the header.
>
> Signed-off-by: Alex Bennée <address@hidden>
> ---

Reviewed-by: Aleksandar Markovic <address@hidden>

>  .mailmap                            | 14 ++++++++++++++
>  contrib/gitdm/aliases               | 20 ++++++++++++++++++--
>  contrib/gitdm/group-map-individuals |  3 ++-
>  3 files changed, 34 insertions(+), 3 deletions(-)
>
> diff --git a/.mailmap b/.mailmap
> index d0fc1d793c6..0756a0bf66d 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -1,4 +1,18 @@
>  # This mailmap fixes up author names/addresses.
> +#
> +# If you are adding to this file consider if a similar change needs to
> +# be made to contrib/gitdm/aliases. They are not however completely
> +# analogous. .mailmap is concerned with fixing up damaged author
> +# fields where as the gitdm equivalent is more concerned with making
> +# sure multiple email addresses get mapped onto the same author.
> +#
> +# From man git-shortlog the forms are:
> +#
> +#  Proper Name <address@hidden>
> +#  <address@hidden> <address@hidden>
> +#  Proper Name <address@hidden> <address@hidden>
> +#  Proper Name <address@hidden> Commit Name <address@hidden>
> +#
>
>  # The first section translates weird addresses from the original git
import
>  # into proper addresses so that they are counted properly by git
shortlog.
> diff --git a/contrib/gitdm/aliases b/contrib/gitdm/aliases
> index 07fd3391a56..c1e744312f5 100644
> --- a/contrib/gitdm/aliases
> +++ b/contrib/gitdm/aliases
> @@ -1,6 +1,22 @@
>  #
> -# This is the email aliases file, mapping secondary addresses
> -# onto a single, canonical address. Duplicates some info from .mailmap
> +# This is the email aliases file, mapping secondary addresses onto a
> +# single, canonical address. It duplicates some info from .mailmap so
> +# if you are adding something here also consider if the .mailmap needs
> +# updating.
> +#
> +# If you just want to avoid gitdm complaining about author fields
> +# which are actually email addresses with the message:
> +#
> +#   "...is an author name, probably not what you want"
> +#
> +# you can just apply --use-mailmap to you git-log command, e.g:
> +#
> +#   git log --use-mailmap --numstat --since "last 2 years" | $GITDM
> +#
> +# however that will have the effect of squashing multiple addresses to
> +# a canonical address which will distort the stats of those who
> +# contribute in both personal and professional capacities from
> +# different addresses.
>  #
>
>  # weird commits
> diff --git a/contrib/gitdm/group-map-individuals
b/contrib/gitdm/group-map-individuals
> index 05e355d30ec..1c847174380 100644
> --- a/contrib/gitdm/group-map-individuals
> +++ b/contrib/gitdm/group-map-individuals
> @@ -2,7 +2,8 @@
>  # Individual and personal contributors
>  #
>  # This is simply to allow prolific developers with no company
> -# affiliations to be grouped together in the summary stats.
> +# affiliations (or non-company related personal work) to be grouped
> +# together in the summary stats.
>  #
>
>  address@hidden
> --
> 2.20.1
>
>