From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.81]) by mx.groups.io with SMTP id smtpd.web12.3933.1587639669043110346 for ; Thu, 23 Apr 2020 04:01:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Q1FP6dfP; spf=pass (domain: redhat.com, ip: 207.211.31.81, mailfrom: philmd@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587639668; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lveo04E11OJyRPp8JkQkj5MwwV5DaWtnSDgr8HVu0XU=; b=Q1FP6dfPYTgOKqAiXHzevLNATXzfdp3KzPy3FTJa4ult8/IodoHbheJlQ6VBRDG3ixwkvI xYoBBxNcKzu8J6zLCPX7U9jT9+qnUU2j/kAZzZ7khtlr8v6X6c4Eegiwk/rpdst1XEw9FE HiZEy9YqDplvrKIiz+8H0VJJUvNRVjQ= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205-iNuhyBpdOiuNEfvRnZifFw-1; Thu, 23 Apr 2020 07:01:04 -0400 X-MC-Unique: iNuhyBpdOiuNEfvRnZifFw-1 Received: by mail-wm1-f70.google.com with SMTP id n127so2161279wme.4 for ; Thu, 23 Apr 2020 04:01:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=lveo04E11OJyRPp8JkQkj5MwwV5DaWtnSDgr8HVu0XU=; b=fMzbb7hb1yR/dgqrQmIK0Lo2sWLROKk1Htea5b4kJSi4eiy5VD8SpUleWqUQdRNrKS cyQVZcUfOiCHtbNUZgJIL87HtDyqddUoG3sEvDufEZcShkBRq0y8kbyEgrH4tzSxXgeF z7DJBYVWLDgJBd6SdK5S6p/rGLc1a36xZ4xe9erEekcoKAQMO+CDdhvHl+/V/STFC3ar KJWPYWFcYymbnJnzfTSMAH3huERQXrJ42Xrog3lPnXTilSJsPcaaz4rXO4KzLv/Seo/s ly+uGJT0H1Xq+Ah2KOr1kivg6/v1va/CvhaNVkXB06s1AU7XJD3CGy1WUb1JHekQkWXt yoOg== X-Gm-Message-State: AGi0PubiC0rE/5D9l4mhGL6rBNiffmpyA7utsKsg+yadXLLQ6rw3BsnR S9r+stCc8tQU49kBwSBPCFFwKvFCQL80Gc87dMbi4Ah+uSgkUGNW1e2c7R40GnbaMUPO9bkMBO/ 33BKcxhrmPL8qMg== X-Received: by 2002:a1c:544c:: with SMTP id p12mr3548874wmi.88.1587639663195; Thu, 23 Apr 2020 04:01:03 -0700 (PDT) X-Google-Smtp-Source: APiQypKuYpI3ihMrIXqHq/pvcAfFYhZqnVUc2kHgXobw8Z40bJjWcbFOhuslLd3NucHyFKBfTKEwhg== X-Received: by 2002:a1c:544c:: with SMTP id p12mr3548843wmi.88.1587639662864; Thu, 23 Apr 2020 04:01:02 -0700 (PDT) Return-Path: Received: from [192.168.1.39] (116.red-83-42-57.dynamicip.rima-tde.net. [83.42.57.116]) by smtp.gmail.com with ESMTPSA id z15sm3128099wrs.47.2020.04.23.04.01.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Apr 2020 04:01:02 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH 1/1] BaseTools: convert diff.order to LF-only To: devel@edk2.groups.io, leif@nuviainc.com Cc: Andrew Fish , Laszlo Ersek , Michael D Kinney , Bob Feng , Liming Gao References: <20200422154652.3853-1-leif@nuviainc.com> From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= Message-ID: Date: Thu, 23 Apr 2020 13:01:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200422154652.3853-1-leif@nuviainc.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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. Reviewed-by: Philippe Mathieu-Daude > +# > +# SPDX-License-Identifier: BSD-2-Clause-Patent > +# > +*.dec > +*.dsc.inc > +*.dsc > +*.fdf > +*.inf > +*.h > +*.vfr > +*.c >