From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.120]) by mx.groups.io with SMTP id smtpd.web10.379.1576692673262877792 for ; Wed, 18 Dec 2019 10:11:13 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Aikl35ga; spf=pass (domain: redhat.com, ip: 205.139.110.120, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576692672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FEO4uXS+64AjcU7lDyvFr8QmZzwb7/UdBTlab4FbxFQ=; b=Aikl35gaZngp8RGfmuligPfrOKvx5eaBENBKuyJ2BJxq9qPpXgMQjtDS3q9yQQscSfy/sE F/6X3OAFOLuqJvPeaRuGZjGsvYw5BjvYrOslrEkvueJPp+ar3WhPa+24SEvhf189lGPTSc 9uMTpwv63BW+U6kq8LBp0jAkdITSIRk= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-76-gUS62GLYMWC3GVkcfR8jAQ-1; Wed, 18 Dec 2019 13:11:07 -0500 Received: by mail-wr1-f71.google.com with SMTP id l20so1191751wrc.13 for ; Wed, 18 Dec 2019 10:11:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=FEO4uXS+64AjcU7lDyvFr8QmZzwb7/UdBTlab4FbxFQ=; b=sMprsl1Rv7yRPrMQPe/u+XAuJMy2HIW7LTZ+y1Sl3UHOmqxQMoeoRDardDVaBUzwR7 VAn8VLgiv+S+r/cWJzXLrGKDNOffwAPK7o1t/bHK76yafm2AWn43pq5v1Y8TqEOBd9Nl egymsioljjiEu+ZGHF3T5DLbq5N9S+y1/vJbITPydkfFfzJJ62I0LcARcKxFn0WULHuo VeLI+J4SFyDabmBAt2aNiFpo0PRwnF++Fj9Ip+/I0QaYCDoOS7jZ+2aaXGkvYiFTZtcD Dhv3o8OfYmiY5BFnJ05NGJ2FQzJaleqNzjKAh2qQv5HO9cIczaWNSDj7zH8hARmOaZ2A lNFA== X-Gm-Message-State: APjAAAU1LW0PwKGzTAuEVTh52+lPTVuOM5DAEzDzP88C3LIigsd17fFZ JY0rhXb6keZm3e8siWQqvE67sCUzKiv7rRsvmXFoLGBQ3PnjBLlKoyjgXPeJvuKX0dQvkZiQkkZ Icuxrmggxqt0H2w== X-Received: by 2002:adf:8297:: with SMTP id 23mr4046016wrc.379.1576692665237; Wed, 18 Dec 2019 10:11:05 -0800 (PST) X-Google-Smtp-Source: APXvYqzL1bN4RFYOa8yVYGKgpLRJWUTr83dOBC5UgUEntoLZIa0gVln2UDRcrgAeiyKHzUWM652sPg== X-Received: by 2002:adf:8297:: with SMTP id 23mr4045988wrc.379.1576692664925; Wed, 18 Dec 2019 10:11:04 -0800 (PST) Return-Path: Received: from [192.168.1.35] (34.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.34]) by smtp.gmail.com with ESMTPSA id k11sm3245524wmc.20.2019.12.18.10.11.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Dec 2019 10:11:04 -0800 (PST) Subject: Re: [edk2-devel] [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py To: devel@edk2.groups.io, nathaniel.l.desimone@intel.com Cc: "Feng, Bob C" , "Gao, Liming" , Leif Lindholm References: <15DDDAE6FE3C410D.8264@groups.io> <02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: Date: Wed, 18 Dec 2019 19:11:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <02A34F284D1DA44BB705E61F7180EF0AB5C64C6F@ORSMSX114.amr.corp.intel.com> X-MC-Unique: gUS62GLYMWC3GVkcfR8jAQ-1 X-Mimecast-Spam-Score: 0 Content-Language: en-US Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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 On Behalf Of Nate DeSimone > Sent: Friday, December 6, 2019 10:15 AM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming ; Leif Lindholm > 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 > Cc: Liming Gao > Cc: Leif Lindholm > Signed-off-by: Nate DeSimone > --- > 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.
> +# Copyright (c) 2019, Intel Corporation. All rights reserved.
> # > # 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 > > > > > > >