From: Eric Blake <[email protected]>
Documenting that we should not add new lines to work around SPF
rewrites sounds foreboding; the intent is instead that new lines here
are okay, but indicate a second problem elsewhere in our build process
that we should also consider fixing at the same time, to keep the
section from growing without bounds. While we have been doing that
for qemu-devel for a while, we jut recently fixed that for qemu-block:
https://git.linaro.org/people/pmaydell/misc-scripts.git/commit/?id=f9a317392
Mentioning DMARC alongside SPF may also help people grep for this
scenario, as well as documenting the 'git config' workaround that can
be used by submitters to avoid the munging issue in the first place.
Note the subtelty: 'git commit' sets authorship information based on
user.name and user.email (where name is usually unquoted); while 'git
format-patch' includes a body 'From:' line only when sendemail.from is
present but differs from authorship information. Hence the use of
quotes in sendemail.from (not a semantic change to email, but enough
of a difference to add the body 'From:').
Fixes: 3bd2608d ("maint: Add .mailmap entries for patches claiming list
authorship")
CC: Andrey Drobyshev <[email protected]>
Cc: Peter Maydell <[email protected]>
Signed-off-by: Eric Blake <[email protected]>
---
Once again, sending this patch to the list with my git config
temporarily changed. I used a command line:
git config sendemail.from '"Eric Blake" <eblakeWredhat.com>'
which turned into this in my .git/config:
[sendemail]
from = \"Eric Blake\" <[email protected]>
My editor window in 'git send-email' doesn't show the body from line,
but hopefully the list archives do (that is, the addition of a body
>From appears to be a post-processing step done by git after my editor
window closes but before the final mail is actually shoved out my MUA)
---
.mailmap | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/.mailmap b/.mailmap
index 04a7feb005b..fadf6e74506 100644
--- a/.mailmap
+++ b/.mailmap
@@ -40,7 +40,19 @@ Nick Hudson <[email protected]> [email protected]
<[email protected]>
# for the cvs2svn initialization commit e63c3dc74bf.
# Next, translate a few commits where mailman rewrote the From: line due
-# to strict SPF, although we prefer to avoid adding more entries like that.
+# to strict SPF and DMARC. Usually, our build process should be flagging
+# commits like these before maintainer merges; if you find the need to add
+# a line here, please also report a bug against the part of the build
+# process that let the mis-attribution slip through in the first place.
+#
+# If the mailing list munges your emails, use:
+# git config sendemail.from '"Your Name" <[email protected]>'
+# the use of "" in that line will differ from the typically unquoted
+# 'git config user.name', which in turn is sufficient for 'git send-email'
+# to add an extra From: line in the body of your email that takes
+# precedence over any munged From: in the mail's headers.
+# See https://lists.openembedded.org/g/openembedded-core/message/166515
+# and https://lists.gnu.org/archive/html/qemu-devel/2023-09/msg06784.html
Ed Swierk <[email protected]> Ed Swierk via Qemu-devel
<[email protected]>
Ian McKellar <[email protected]> Ian McKellar via Qemu-devel
<[email protected]>
Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel
<[email protected]>
--
2.41.0
