From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by groups.io with SMTP; Thu, 08 Aug 2019 15:34:08 -0700 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30ACA30A00C7; Thu, 8 Aug 2019 22:34:08 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-28.ams2.redhat.com [10.36.116.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63CC55C219; Thu, 8 Aug 2019 22:34:06 +0000 (UTC) Subject: Re: [edk2-devel] [Patch 3/3] BaseTools/PatchCheck: Disable text conversion in 'git show' To: Andrew Fish , devel@edk2.groups.io, Mike Kinney , Leif Lindholm Cc: Jordan Justen , "Feng, Bob C" , "Gao, Liming" References: <20190802001314.25980-1-michael.d.kinney@intel.com> <20190802001314.25980-4-michael.d.kinney@intel.com> <156477054101.20290.17514635538979393303@jljusten-skl> <8d511f89-f2a8-4d29-65e3-cc76fee12017@redhat.com> <156520696314.20973.15022549262963633561@jljusten-skl> <3a753a0c-8df9-4bf1-94be-b3f2c25c61df@redhat.com> <028D7F84-9970-450F-B6A9-4FEC8E5557D6@apple.com> From: "Laszlo Ersek" Message-ID: Date: Fri, 9 Aug 2019 00:34:05 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <028D7F84-9970-450F-B6A9-4FEC8E5557D6@apple.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Thu, 08 Aug 2019 22:34:08 +0000 (UTC) Content-Type: text/plain; charset=windows-1252 Content-Language: en-US Content-Transfer-Encoding: 7bit On 08/08/19 23:15, Andrew Fish wrote: > > >> On Aug 8, 2019, at 2:08 PM, Michael D Kinney wrote: >> >> Laszlo, >> >> This sounds like a good improvement. >> >> Do you have a recommended set of settings you would like >> to see checked in to the root of each EDK II related >> repository that would be required settings for all EDK II >> developers. >> > > Crazy idea allert ..... > > Could edksetup.sh have a --git option to set preferred git defaults? Again, here I have to apologize to Leif: Leif has already contributed the SetupGit.py script, which needs to be run only once, and then the right settings are put in place permanently. See the following two commits: - 5b3e695d8ac5 ("BaseTools: add centralized location for git config files", 2019-06-12) - 4eb0acb1e2be ("BaseTools: add script to configure local git options", 2019-06-12) The first commit adds: BaseTools/Conf/diff.order BaseTools/Conf/gitattributes and the second commit adds: BaseTools/Scripts/SetupGit.py Running the "SetupGit.py" script points configuration knobs permanently to the files added in the preceding commit, plus puts other settings in place (also permanently). Again, my (somewhat) lame excuse for forgetting about these commits is that I've never been *forced* to run the script myself. :) Thanks Laszlo >> Do you want to enter a BZ and prepare a patch with this >> new file for the edk2 repo. Once it is approved and added >> to edk2 repo, we can propagate to the other EDK II related >> repos. >> >> Thanks, >> >> Mike >> >>> -----Original Message----- >>> From: devel@edk2.groups.io >>> [mailto:devel@edk2.groups.io ] On Behalf Of Laszlo Ersek >>> Sent: Thursday, August 8, 2019 1:58 PM >>> To: devel@edk2.groups.io ; Justen, Jordan L >>> >; Kinney, Michael D >>> > >>> Cc: Feng, Bob C >; Gao, Liming >>> > >>> Subject: Re: [edk2-devel] [Patch 3/3] >>> BaseTools/PatchCheck: Disable text conversion in 'git >>> show' >>> >>> On 08/07/19 21:42, Jordan Justen wrote: >>> >>>> I thought adding Laszlo's settings >>>> to .gitattributes might amount to solving two issues >>> with one change. >>> >>> Independently of the present patch, I would be very >>> much in favor of tracking a .gitattributes file in the >>> project root dir, *if* we could also automate the >>> following setting: >>> >>> git config diff.ini.xfuncname '^\[[A-Za-z0-9_., >>> ]+]' >>> >>> For me as a reviewer, that setting (on the submitter >>> side) makes a huge difference. I keep asking people to >>> do it manually, and that gets old really quick. >>> Unfortunately, I don't know how to automate that config >>> knob from within the source tree. :( >>> >>> Thanks, >>> Laszlo >>> >>> >> >> >> > >