From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 651B3C3A5A1 for ; Wed, 28 Aug 2019 12:27:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CFAE20856 for ; Wed, 28 Aug 2019 12:27:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="li1toCyL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CFAE20856 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2x3O-0008O3-73 for qemu-devel@archiver.kernel.org; Wed, 28 Aug 2019 08:27:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47189) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2wlV-0002KB-73 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 08:09:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2wlT-0004EM-VP for qemu-devel@nongnu.org; Wed, 28 Aug 2019 08:09:29 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:42736) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2wlT-0004Dz-PY for qemu-devel@nongnu.org; Wed, 28 Aug 2019 08:09:27 -0400 Received: by mail-wr1-x42e.google.com with SMTP id b16so2234119wrq.9 for ; Wed, 28 Aug 2019 05:09:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KSEgW/RlIiuzqLmIOofMJWxF7Te87Mr+srbDIEOWTAs=; b=li1toCyLJbHv8GUACtUJp+Wl/5kx/sdc1lgOMMO0m9q8xmv32DrXCPd1Am64LTn+vq ITntiiXWgSy2C+vtwx3GiP5d/nwLdeJYV4fOjPBYg753S6XSqJH+3FxVWKNzra2e7BX1 ANeeed3Mwlgxctq1YKLOVWFMUdR75hO/zuExAJazdY3gV/mrmcr6K8+v/sYFTtc4aVjF jgEpRBE9SvzuNRO5wjCk2OTd1jllYxJaGn33x++23hQlcLuLCYBHHUOiSIDmmkEcIhe3 ObNmoSiZl9y3qmCpcSL/t2XX3wYQZtMQD7Z4nKlf4kVf1ISY5yml5YKUzh69iIU2Uh/F XbgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KSEgW/RlIiuzqLmIOofMJWxF7Te87Mr+srbDIEOWTAs=; b=hhVX4eF4m/aBZBFAv6XTi9TFFTDiQGplU+D2H2uTbbofUzP+zUjRO313xkjMFcttsN nyL2cD2gmf22ftXNJ2cHqkHfDdw72D9N9hKXE8EAf2j1NDnBX5zWW5AMwW1Q0mmtuyEz TfzaAmlSmASUCPFMJqaAjXdu9IFBq1sJ0caZ+0ZPlLYQSx3W+fKf/NH8EeDbKySV5ZkG mSMCtEgvwQM7pk9zZSRZJs7JmJcY29Bjdlxx/2nW0JN0EZxTqcGafu9svRYET5rN97um NLvfyFaSaEUudmsVN/whV0TB8brlLKABnRw/PpKGf/1WzeY/BytyimPZLgXfCicQrvSq ltwQ== X-Gm-Message-State: APjAAAXGH47BmvhgoizrQuZhycdn1GW0T2YYxUCgcrDu9Pu1Wv4hkbDr 4Hw39bTBm/BBMTBxov9ZAgs9Jw== X-Google-Smtp-Source: APXvYqx2cPnFNGGZGVu71rf8W0qV5kl6JYtvg1ma1hqdmEtSj21BmKHk0gVtwPNTWv4rj0ZM8wx1lw== X-Received: by 2002:a5d:664a:: with SMTP id f10mr4385939wrw.90.1566994166756; Wed, 28 Aug 2019 05:09:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b4sm2742440wma.5.2019.08.28.05.09.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 05:09:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6390A1FF93; Wed, 28 Aug 2019 13:09:22 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 13:09:19 +0100 Message-Id: <20190828120921.9586-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190828120921.9586-1-alex.bennee@linaro.org> References: <20190828120921.9586-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42e Subject: [Qemu-devel] [PATCH v1 6/8] .mailmap/aliases: add some further commentary X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- .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 +# +# Proper Name +# Proper Name Commit Name +# # 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. # f4bug@amsat.org -- 2.20.1