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<CR>, 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 <bob.c.f...@intel.com>
> > Cc: Liming Gao <liming....@intel.com>
> > Signed-off-by: Leif Lindholm <l...@nuviainc.com>
> > ---
> >
> > 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 <phi...@redhat.com>
Thanks!
/
Leif
>
> > +#
> > +# SPDX-License-Identifier: BSD-2-Clause-Patent
> > +#
> > +*.dec
> > +*.dsc.inc
> > +*.dsc
> > +*.fdf
> > +*.inf
> > +*.h
> > +*.vfr
> > +*.c
> >
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#57965): https://edk2.groups.io/g/devel/message/57965
Mute This Topic: https://groups.io/mt/73198992/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
