From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web09.7781.1575656129984273827 for ; Fri, 06 Dec 2019 10:15:30 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: nathaniel.l.desimone@intel.com) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Dec 2019 10:15:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,285,1571727600"; d="scan'208";a="206186051" Received: from nldesimo-desk1.amr.corp.intel.com ([10.7.159.63]) by orsmga008.jf.intel.com with ESMTP; 06 Dec 2019 10:15:29 -0800 From: "Nate DeSimone" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao , Leif Lindholm Subject: [PATCH] BaseTools/Scripts: Add sendemail.transferEncoding to SetupGit.py Date: Fri, 6 Dec 2019 10:15:22 -0800 Message-Id: <20191206181522.2542-1-nathaniel.l.desimone@intel.com> X-Mailer: git-send-email 2.24.0.windows.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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'}, ] -- 2.24.0.windows.2