From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mx.groups.io with SMTP id smtpd.web10.4951.1587643829589987547 for ; Thu, 23 Apr 2020 05:10:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=bogjLT15; spf=pass (domain: nuviainc.com, ip: 209.85.221.65, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f65.google.com with SMTP id k13so6557456wrw.7 for ; Thu, 23 Apr 2020 05:10:29 -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:content-transfer-encoding:in-reply-to :user-agent; bh=bPiE5lk1a/jijLRj2memHvN3luDkJpw9731/DlNteJ4=; b=bogjLT15100W64sIZj04/qwTHug1kllrD48BXKb54kGqnAOQDwbd2ToxNyMXZgEaPW wvs8JH/20K5H/72XSVGMHrlMGdC1EsGRbTDxd0hK3HN1PRSCt5ne9XHmh9EBJxQ3rknc I8R11rdZyQlVwC16gmO8nVoqJciVBuwGrrJUS0B6RfNeXQQyBuB51pHUJpXmhZ/xT7h+ uMLJM+SroVKtqSOGjzVDzhuWbBcaE4LboXTEWOuABB5+C1IxYmCeqalCopoDKvl+gnP6 9EPYv7FlD0iFQqp/eN5RVZ/Jt2PgsT7fWM/E2OFyoelBQ1EV5xZIc5ZVL/bR/mJkTPwJ 9fOA== 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:content-transfer-encoding :in-reply-to:user-agent; bh=bPiE5lk1a/jijLRj2memHvN3luDkJpw9731/DlNteJ4=; b=LQLgZyvDYIosjcoTFGcoFZFRN6hbmgCHgE+ocFtOZ53eUXi/82K0bsrgaHp3wvvrNA nf/RaOIHr0zal73kf+gaXs55vLArEVBA9gtWvVUhnXt144ufdU4nYE1RxiGkfpN4zTA1 QBFxnWoOMJcF0xh6J/jGwO0c59kOZ/13GWKfaZpKqQbVXa70fuevmlbmKJCp9wi1dsQB +KbMxHz5XcBMueazDg3XQD1E/k0BUYTL4D07ExJstj6HtdueSsYMP1968wqwbobog5iK f+59G7BR3DTFEFCd27NNaBBxlYgMqLkoENwIQHxmc3pOniWiNrEeaKZ6IzJpTTWVqgNu vQhA== X-Gm-Message-State: AGi0PuY6ssW8WPbTWImuC2LD2SihzUijdMO/V0QfPTxDybYmHJ3bwFoR k+spkrLXabMdAQkFCtH3d6WfXh9EA4vanbXJnFRkCKbA/lvKPCVGJVOy2ept3GJtu7vcDCLmwp4 5U8fb4SRndcMBMjmY/mDL4mFzuoeFWLxMBURMBp+d4RsB7ClpAd9vjikXZodn9KU= X-Google-Smtp-Source: APiQypKm90eoRpJXr34Y0/Vv/DTn8l2Uvkx2h8NX4UBS4qiCHpyYEAMp9PeTGsYASA7tYsp1j67jQg== X-Received: by 2002:adf:f0cb:: with SMTP id x11mr4696175wro.266.1587643827939; Thu, 23 Apr 2020 05:10:27 -0700 (PDT) Return-Path: Received: from vanye ([2001:470:1f09:12f0:b26e:bfff:fea9:f1b8]) by smtp.gmail.com with ESMTPSA id u12sm3554014wmu.25.2020.04.23.05.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Apr 2020 05:10:27 -0700 (PDT) Date: Thu, 23 Apr 2020 13:10:25 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, philmd@redhat.com Cc: Andrew Fish , Laszlo Ersek , Michael D Kinney , Bob Feng , Liming Gao Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: convert diff.order to LF-only Message-ID: <20200423121025.GD14075@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=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Thu, Apr 23, 2020 at 13:01:01 +0200, Philippe Mathieu-Daudé wrote: > On 4/22/20 5:46 PM, 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... > > *sigh* > > > > > 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. > > Could be worth extending to 2020. Well, if anything, I'd be adding a NUVIA entry :) I did consider it, but couldn't quite bring myself to claiming copyright for having executed dos2unix. Especially as that would set a horrific precedent for the upcoming global line ending conversion set... > > Reviewed-by: Philippe Mathieu-Daude Thanks! / Leif > > > +# > > +# SPDX-License-Identifier: BSD-2-Clause-Patent > > +# > > +*.dec > > +*.dsc.inc > > +*.dsc > > +*.fdf > > +*.inf > > +*.h > > +*.vfr > > +*.c > > > > > >