From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mx.groups.io with SMTP id smtpd.web12.335.1588006411051275870 for ; Mon, 27 Apr 2020 09:53:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=gX3lAKuA; spf=pass (domain: nuviainc.com, ip: 209.85.221.67, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f67.google.com with SMTP id k1so21426650wrx.4 for ; Mon, 27 Apr 2020 09:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=g6zIJUsszPzek7iqnQRXn7kMJG5ZOX6Stg3TTrywm64=; b=gX3lAKuAJhjuu7VdqK6LkreS4Sxuy/3fTVpmJCDZdKijY4wl5alx+CFbcgvyrx1x9C QYh5H8GgtwoTZyp6n8PZ3XT3Q8W5hyGhJG1UL+IRASE6CqZgiq6GzP3f4u1i7WHtuan5 eP4plJZ59iVW/PkobEMBMcB9A4O+J63JfMVOutqm3nyL8p0h7Wbg478rJ+ZzkdDDXXVH xraA18+kYtoY8ymRpQNSvhmcusFHyav79e+05CKZusnG7m5gE0378dupT2yfaSudAX7G RpDVLImEP3dFdOIstS9Vde00fVpe/fAVWwsXSfkwFZtLtgtnY6Od9qvd8UYvVtipSlJh V+VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=g6zIJUsszPzek7iqnQRXn7kMJG5ZOX6Stg3TTrywm64=; b=ZsE9awhg7iKG6MbQK+4ZsIc0bK5QRPdp91ZZQMcdiy00TrPWkMlAgIBwVaeTXr9/Hj c2oW99GjOWrgwVTazr1LRFzvT92chVgg+Tfrao1E1L9Y+yhMmhmimwy1kSJT6td4bBA/ 6RJtqa6MsREdFzJKQTMWXbLnghTfvbL5H95zNZSqjGediXpY3isAa8VwQra+7qGEipHK Hre/26X+ZW96HcQs2BHVH89yONzZjAaYqfn+eDGrUmMqiQ/F18DRfxq4PH/3vqUCgPzT rABaCbiSORlvVNiMC8OYaRjx7SW2K5g4qwcddEsRYit1XJbsd7bX57RRZu+BHC4rMtB7 vvCw== X-Gm-Message-State: AGi0PuZyfWYNMsR3Hah/nJaOxWcjZe8oZImms4j275OiPuDEdnoxJgfi dgjxHzgupyQub9T23fvW2ihi/Q== X-Google-Smtp-Source: APiQypL20bnfbKE/JkHeMNcIgJBvdr33n+cs/wIf8yYsvlKJLqNgTrjUBW/pEDWDkdyncXNkLnklAA== X-Received: by 2002:adf:decb:: with SMTP id i11mr27248178wrn.140.1588006409675; Mon, 27 Apr 2020 09:53:29 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id y63sm17020494wmg.21.2020.04.27.09.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Apr 2020 09:53:29 -0700 (PDT) Date: Mon, 27 Apr 2020 17:53:26 +0100 From: "Leif Lindholm" To: "Gao, Liming" Cc: "devel@edk2.groups.io" , "lersek@redhat.com" , Andrew Fish , "Kinney, Michael D" , "Feng, Bob C" , Sean Brogan Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: convert diff.order to LF-only Message-ID: <20200427165326.GU14075@vanye> References: <20200422154652.3853-1-leif@nuviainc.com> <3f075d5f-7dde-e676-e299-d7a408fe45f8@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Liming, Thanks! I'm sorry but I don't know what "PatchCheck CI pipe line can support the exception." means. I did ask before if there was a way to bypass that particular test. Anyway, I created https://github.com/tianocore/edk2/pull/549 Grateful for any help. Regards, LEif On Mon, Apr 27, 2020 at 15:44:48 +0000, Gao, Liming wrote: > Leif: > I am OK for this change. Reviewed-by: Liming Gao > > As you say, this patch doesn't pass patchcheck. I suggest PatchCheck CI pipe line can support the exception. > > Thanks > Liming > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of Laszlo Ersek > > Sent: Friday, April 24, 2020 9:30 PM > > To: Leif Lindholm ; devel@edk2.groups.io > > Cc: Andrew Fish ; Kinney, Michael D ; Feng, Bob C ; Gao, > > Liming > > Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: convert diff.order to LF-only > > > > On 04/22/20 17:46, Leif Lindholm wrote: > > > SetupGit.py sets the git config option diff.orderFile to > > > {edk2 directory}/BaseTools/Conf/diff.order, to override the default order > > > in which files are shown in a diff/patch/whatever. This is in imitation > > > of what is done manually in Laszlo's Unkempt Guide. > > > > > > However, the version currently in the tree is in CRLF format, which makes > > > git interpret e.g. *.c as matching on *.c, finding no matches and > > > failing to apply the desired reordering. Note: this is true regardless of > > > whether running on Linux or Windows. > > > > > > Convert the file to LF-only to make it work as expected. > > > > > > Cc: Bob Feng > > > Cc: Liming Gao > > > Signed-off-by: Leif Lindholm > > > --- > > > > > > I'm not going to reveal just how much time I wasted on this before I > > > figured out what was going wrong... > > > > > > I am intending to start prototyping the overall CRLF->native > > > conversion shortly, but this needs resolving regardless, and in fact we > > > will need to override the line ending conversion for this file in > > > gitattributes. > > > > > > Arguably, the same logic could be applied to the gitattributes file > > > itself (in the same directory), but since every effective line in that > > > has an explicit option following the glob, it triggers no issues at > > > present. > > > > > > This bug is quite likely also behind some accusations I've made on > > > people not following the correct patch submission process, for which I > > > apologise. > > > > > > Finally, a question: did we have some way of overriding the PatchCheck.py > > > step in mergify? This patch gets an error per line... > > > If not, should I submit a separate patch adding yet another exception to > > > PatchCheck.py > > > > > > / > > > Leif > > > > > > BaseTools/Conf/diff.order | 26 +++++++++++++------------- > > > 1 file changed, 13 insertions(+), 13 deletions(-) > > > > > > diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order > > > index 4361817012c9..f1534f6c187c 100644 > > > --- a/BaseTools/Conf/diff.order > > > +++ b/BaseTools/Conf/diff.order > > > @@ -1,13 +1,13 @@ > > > -# > > > -# Copyright (c) 2019, Linaro Ltd. All rights reserved. > > > -# > > > -# SPDX-License-Identifier: BSD-2-Clause-Patent > > > -# > > > -*.dec > > > -*.dsc.inc > > > -*.dsc > > > -*.fdf > > > -*.inf > > > -*.h > > > -*.vfr > > > -*.c > > > +# > > > +# Copyright (c) 2019, Linaro Ltd. All rights reserved. > > > +# > > > +# SPDX-License-Identifier: BSD-2-Clause-Patent > > > +# > > > +*.dec > > > +*.dsc.inc > > > +*.dsc > > > +*.fdf > > > +*.inf > > > +*.h > > > +*.vfr > > > +*.c > > > > > > > Reviewed-by: Laszlo Ersek > > > > (I must admit that I use my multi-project shared order file, configured > > in my ~/.gitconfig file.) > > > > Thanks > > Laszlo > > > > > > >