From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.6446.1576827582871835647 for ; Thu, 19 Dec 2019 23:39:43 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: bob.c.feng@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Dec 2019 23:39:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,335,1571727600"; d="scan'208";a="298950997" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga001.jf.intel.com with ESMTP; 19 Dec 2019 23:39:42 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Dec 2019 23:39:40 -0800 Received: from shsmsx107.ccr.corp.intel.com (10.239.4.96) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Dec 2019 23:39:39 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.90]) by SHSMSX107.ccr.corp.intel.com ([169.254.9.164]) with mapi id 14.03.0439.000; Fri, 20 Dec 2019 15:39:38 +0800 From: "Bob Feng" To: =?iso-8859-1?Q?Philippe_Mathieu-Daud=E9?= , "devel@edk2.groups.io" , "Desimone, Nathaniel L" CC: "Gao, Liming" , Leif Lindholm Subject: Re: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py Thread-Topic: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py Thread-Index: AQHVrGEr3fv/rHRdhUSiZoFmN8urhae/RehwgAB4PYCAAvkJsA== Date: Fri, 20 Dec 2019 07:39:37 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D161585AE9@SHSMSX104.ccr.corp.intel.com> References: <15DDDAE6FE3C410D.8264@groups.io> <02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi Phil, What I saw the working part of this path is one line, {'section': 'sende= mail', 'option': 'transferEncoding', 'value': '8bit'}, other changes are= just to adjust alignment. Thanks, Bob -----Original Message----- From: Philippe Mathieu-Daud=E9 [mailto:philmd@redhat.com]=20 Sent: Thursday, December 19, 2019 2:11 AM To: devel@edk2.groups.io; Desimone, Nathaniel L Cc: Feng, Bob C ; Gao, Liming = ; Leif Lindholm Subject: Re: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transfe= rEncoding to SetupGit.py Hi Nate, On 12/18/19 4:01 AM, Nate DeSimone wrote: > Any chance I could get a code review on this? >=20 > Thanks, > Nate >=20 > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Nate=20 > DeSimone > Sent: Friday, December 6, 2019 10:15 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming=20 > ; Leif Lindholm > Subject: [edk2-devel] [PATCH] BaseTools/Scripts: Add=20 > sendemail.transferEncoding to SetupGit.py >=20 > If git finds a '\r' character in the message, then it converts the entir= e message content into Quoted-Printable encoding. It appears that when grou= ps.io converts the QP encoding back to text format, the '\r' characters som= ehow become '\n'. To workaround this, the SetupGit.py script will now expli= citly set the sendemail.transferEncoding git config option to '8bit' >=20 > Cc: Bob Feng > Cc: Liming Gao > Cc: Leif Lindholm > Signed-off-by: Nate DeSimone > --- > BaseTools/Scripts/SetupGit.py | 38 ++++++++++++++++++----------------- > 1 file changed, 20 insertions(+), 18 deletions(-) >=20 > diff --git a/BaseTools/Scripts/SetupGit.py=20 > 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=20 > projects # # Copyright (c) 2019, Linaro Ltd. All rights=20 > reserved.
> +# Copyright (c) 2019, Intel Corporation. All rights reserved.
> # > # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -53,29 +54,30=20 > @@ MIN_GIT_VERSION =3D (1, 9, 0) > =20 > # Set of options to be set identically for all repositories OPTIONS = =3D [ > - {'section': 'am', 'option': 'keepcr', 'value': Tru= e}, > - {'section': 'am', 'option': 'signoff', 'value': Tru= e}, > - {'section': 'cherry-pick', 'option': 'signoff', 'value': Tru= e}, > - {'section': 'color', 'option': 'diff', 'value': Tru= e}, > - {'section': 'color', 'option': 'grep', 'value': 'au= to'}, > - {'section': 'commit', 'option': 'signoff', 'value': Tru= e}, > - {'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': 'pa= tience'}, > + {'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': 'co= pies'}, > - {'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': Tru= e}, > - {'section': 'format', 'option': 'numbered', 'value': Tru= e}, > - {'section': 'format', 'option': 'signoff', 'value': Fal= se}, > - {'section': 'notes', 'option': 'rewriteRef', 'value': 're= fs/notes/commits'}, > - {'section': 'sendemail', 'option': 'chainreplyto', 'value': Fal= se}, > - {'section': 'sendemail', 'option': 'thread', 'value': Tru= e}, > + {'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',=20 '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=3Dcolor'. If I missed anything, you s= imply added: + {'section': 'sendemail', 'option': 'transferEncoding', 'value':=20 '8bit'}, Is that right? > ] > =20 > =20 > -- > 2.24.0.windows.2 >=20 >=20 >=20 >=20 >=20 >=20 >=20