From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: devel@edk2.groups.io, nathaniel.l.desimone@intel.com
Cc: "Feng, Bob C" <bob.c.feng@intel.com>,
"Gao, Liming" <liming.gao@intel.com>,
Leif Lindholm <leif.lindholm@linaro.org>
Subject: Re: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
Date: Wed, 18 Dec 2019 19:11:03 +0100 [thread overview]
Message-ID: <c009b2c1-35ab-7572-226b-1701328cd0ac@redhat.com> (raw)
In-Reply-To: <02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com>
Hi Nate,
On 12/18/19 4:01 AM, Nate DeSimone wrote:
> Any chance I could get a code review on this?
>
> Thanks,
> Nate
>
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Nate DeSimone
> Sent: Friday, December 6, 2019 10:15 AM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>; Leif Lindholm <leif.lindholm@linaro.org>
> Subject: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py
>
> If git finds a '\r' character in the message, then it converts the entire message content into Quoted-Printable encoding. It appears that when groups.io converts the QP encoding back to text format, the '\r' characters somehow become '\n'. To workaround this, the SetupGit.py script will now explicitly set the sendemail.transferEncoding git config option to '8bit'
>
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
> ---
> BaseTools/Scripts/SetupGit.py | 38 ++++++++++++++++++-----------------
> 1 file changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/BaseTools/Scripts/SetupGit.py b/BaseTools/Scripts/SetupGit.py index 3d39d3b35f..514f1c4d42 100644
> --- a/BaseTools/Scripts/SetupGit.py
> +++ b/BaseTools/Scripts/SetupGit.py
> @@ -2,6 +2,7 @@
> # Set up the git configuration for contributing to TianoCore projects # # Copyright (c) 2019, Linaro Ltd. All rights reserved.<BR>
> +# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> #
> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -53,29 +54,30 @@ MIN_GIT_VERSION = (1, 9, 0)
>
> # Set of options to be set identically for all repositories OPTIONS = [
> - {'section': 'am', 'option': 'keepcr', 'value': True},
> - {'section': 'am', 'option': 'signoff', 'value': True},
> - {'section': 'cherry-pick', 'option': 'signoff', 'value': True},
> - {'section': 'color', 'option': 'diff', 'value': True},
> - {'section': 'color', 'option': 'grep', 'value': 'auto'},
> - {'section': 'commit', 'option': 'signoff', 'value': True},
> - {'section': 'core', 'option': 'abbrev', 'value': 12},
> + {'section': 'am', 'option': 'keepcr', 'value': True},
> + {'section': 'am', 'option': 'signoff', 'value': True},
> + {'section': 'cherry-pick', 'option': 'signoff', 'value': True},
> + {'section': 'color', 'option': 'diff', 'value': True},
> + {'section': 'color', 'option': 'grep', 'value': 'auto'},
> + {'section': 'commit', 'option': 'signoff', 'value': True},
> + {'section': 'core', 'option': 'abbrev', 'value': 12},
> {'section': 'core', 'option': 'attributesFile',
> 'value': os.path.join(CONFDIR, 'gitattributes').replace('\\', '/')},
> - {'section': 'core', 'option': 'whitespace', 'value': 'cr-at-eol'},
> - {'section': 'diff', 'option': 'algorithm', 'value': 'patience'},
> + {'section': 'core', 'option': 'whitespace', 'value': 'cr-at-eol'},
> + {'section': 'diff', 'option': 'algorithm', 'value': 'patience'},
> {'section': 'diff', 'option': 'orderFile',
> 'value': os.path.join(CONFDIR, 'diff.order').replace('\\', '/')},
> - {'section': 'diff', 'option': 'renames', 'value': 'copies'},
> - {'section': 'diff', 'option': 'statGraphWidth', 'value': '20'},
> - {'section': 'diff "ini"', 'option': 'xfuncname',
> + {'section': 'diff', 'option': 'renames', 'value': 'copies'},
> + {'section': 'diff', 'option': 'statGraphWidth', 'value': '20'},
> + {'section': 'diff "ini"', 'option': 'xfuncname',
> 'value': '^\\\\[[A-Za-z0-9_., ]+]'},
> - {'section': 'format', 'option': 'coverLetter', 'value': True},
> - {'section': 'format', 'option': 'numbered', 'value': True},
> - {'section': 'format', 'option': 'signoff', 'value': False},
> - {'section': 'notes', 'option': 'rewriteRef', 'value': 'refs/notes/commits'},
> - {'section': 'sendemail', 'option': 'chainreplyto', 'value': False},
> - {'section': 'sendemail', 'option': 'thread', 'value': True},
> + {'section': 'format', 'option': 'coverLetter', 'value': True},
> + {'section': 'format', 'option': 'numbered', 'value': True},
> + {'section': 'format', 'option': 'signoff', 'value': False},
> + {'section': 'notes', 'option': 'rewriteRef', 'value': 'refs/notes/commits'},
> + {'section': 'sendemail', 'option': 'chainreplyto', 'value': False},
> + {'section': 'sendemail', 'option': 'thread', 'value': True},
> + {'section': 'sendemail', 'option': 'transferEncoding', 'value': '8bit'},
Unfortunately I never received the original patch.
I downloaded it from
https://www.redhat.com/archives/edk2-devel-archive/2019-December/msg00720.html
but I get an error when applying:
**** malformed patch at line 12: - {'section': 'am',
'option': 'signoff', 'value': True},
Due to space/tab? changes, your patch is very hard to review (I wanted
to look at it with 'git-diff --word-diff=color'. If I missed anything,
you simply added:
+ {'section': 'sendemail', 'option': 'transferEncoding', 'value':
'8bit'},
Is that right?
> ]
>
>
> --
> 2.24.0.windows.2
>
>
>
>
>
>
>
next prev parent reply other threads:[~2019-12-18 18:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <15DDDAE6FE3C410D.8264@groups.io>
2019-12-18 3:01 ` [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py Nate DeSimone
2019-12-18 6:08 ` Bob Feng
2019-12-18 18:11 ` Philippe Mathieu-Daudé [this message]
2019-12-20 7:39 ` Bob Feng
2020-01-02 16:52 ` Nate DeSimone
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c009b2c1-35ab-7572-226b-1701328cd0ac@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox