From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web10.5488.1587571747835427421 for ; Wed, 22 Apr 2020 09:09:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=Y+KccVRJ; spf=pass (domain: nuviainc.com, ip: 209.85.128.52, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f52.google.com with SMTP id x25so3023469wmc.0 for ; Wed, 22 Apr 2020 09:09:07 -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=eYa9bdpZqLaun+/Nh17Xolyf+8emGYwIPYzg5ZX+rZ0=; b=Y+KccVRJbtMhPrnem7fTOQiDkoMxvh+za1iA5dIN3iWsIgF8XtNjY9opVJTgsjR8bv NsjZ9zZb2YjVoW0ASlJmId1DRk/5XAO7PxB6JcUBh2fCgzwKU9WBWxXig58kAeCZemDK z6/VHURbcKOALgEsc+LG7uZcxkXjDUbMv2TvK4x5HaPNK617nDAd+WC/PIlheP06V5lb F18uF7r78wTRwje0u2+cMgDma2hBTSJoHwd3a5qM/+aJ2igTh3XBeU5jTiYpmlrsbMsg 3JSxaJi9C0wSuQ9GE8vStnO/at5P3Q6vP7VzwED7mV4xs2XpwCsXOJW9COl36t7Nb+Dr rwQw== 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=eYa9bdpZqLaun+/Nh17Xolyf+8emGYwIPYzg5ZX+rZ0=; b=UrIXHnOQTZmmdY38pGMeXJ+MTnPonAxQMAyuPS8RC5vgzf5cI6nrUGXfXDRtFRVtMp 3aqT6X+jL/gZ0KlaidJ39Li/ZIOqu69KpiRT/VC9U2DHU/rz4I6Aw6uDjvhA2E29Yx/D yAKXXzyLpvUGsIHO1VAr1vRm5pdF4gz5FJczf36DIuEE0R+ZNaLDmvAkOt5z43kJEpeh FdEkaqDD6pH5BMm4v+QWhPGuq2vEEEpfe6brigI8AVyQiE1BbLI30uai+txV+ct7vNhe jMesWATUEWfGtzjxbpfbos1mGbvBlff//bEnORjbRmWdiDKNwQHkGB1omDsNzRwp70mt 7Y+w== X-Gm-Message-State: AGi0PubWDf6x33mOPb18H0erCl7YB3AmjcE2/1Cu4Nc1UtzLz5sKLCHM hmsMe1MV1AganCFKdLw5lDCQ6jPSQjd1ipW36q5pYbPBD3jevAOaTqrQh8VL4ZlDKONalCuYua7 EEmeryTYATanA4DNC3o2T3E/a4QW99TdjETFVU4b0nxY5rsJ7rkRbrr/J1bmexVI= X-Google-Smtp-Source: APiQypKEiayDTueilDvAxaxJY7mZ4GvcJC6GNq+a28/FI2S1arHrPpaNUsaNTy4IMZ6m1Dc+zjfGdg== X-Received: by 2002:a1c:6787:: with SMTP id b129mr11797806wmc.165.1587571746138; Wed, 22 Apr 2020 09:09:06 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id j4sm8884375wrm.85.2020.04.22.09.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 09:09:05 -0700 (PDT) Date: Wed, 22 Apr 2020 17:09:03 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, michael.d.kinney@intel.com Cc: Andrew Fish , Laszlo Ersek , "Feng, Bob C" , "Gao, Liming" Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: convert diff.order to LF-only Message-ID: <20200422160903.GN14075@vanye> References: <20200422154652.3853-1-leif@nuviainc.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 Mike, Well, it's a line-ending conversion: it deletes all lines, then it adds them (this time without ). / Leif On Wed, Apr 22, 2020 at 16:05:34 +0000, Michael D Kinney wrote: > Leif, > > PatchCheck.py should only check added lines, not removed lines. > > Are you seeing an error on a removed line? > > Mike > > > -----Original Message----- > > From: Leif Lindholm > > Sent: Wednesday, April 22, 2020 8:47 AM > > To: devel@edk2.groups.io > > Cc: Andrew Fish ; Laszlo Ersek > > ; Kinney, Michael D > > ; Feng, Bob C > > ; Gao, Liming > > > > Subject: [PATCH 1/1] BaseTools: convert diff.order to > > LF-only > > > > 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 > > -- > > 2.20.1 > > > >