On Mon, Jun 03, 2019 at 02:43:23PM +0200, Laszlo Ersek wrote:
> On 05/30/19 17:59, Leif Lindholm wrote:
> > Before adding the git environment initialization script, add the
> > following files that will be pointed to after running said script:
> >
> > - BaseTools/Conf/diff.order
> > - BaseTools/Conf/gitattributes
> >
> > Signed-off-by: Leif Lindholm <leif.lindh...@linaro.org>
> > ---
> > BaseTools/Conf/diff.order | 8 ++++++++
> > BaseTools/Conf/gitattributes | 14 ++++++++++++++
> > 2 files changed, 22 insertions(+)
> > create mode 100644 BaseTools/Conf/diff.order
> > create mode 100644 BaseTools/Conf/gitattributes
> >
> > diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order
> > new file mode 100644
> > index 0000000000..1d578ac28c
> > --- /dev/null
> > +++ b/BaseTools/Conf/diff.order
> > @@ -0,0 +1,8 @@
> > +*.dec
> > +*.dsc.inc
> > +*.dsc
> > +*.fdf
> > +*.inf
> > +*.h
> > +*.vfr
> > +*.c
> > diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes
> > new file mode 100644
> > index 0000000000..a8f923fd8a
> > --- /dev/null
> > +++ b/BaseTools/Conf/gitattributes
> > @@ -0,0 +1,14 @@
> > +*.efi -diff
> > +*.EFI -diff
> > +*.bin -diff
> > +*.BIN -diff
> > +*.raw -diff
> > +*.RAW -diff
> > +*.bmp -diff
> > +*.BMP -diff
> > +*.dec diff=ini
> > +*.dsc diff=ini
> > +*.dsc.inc diff=ini
> > +*.fdf diff=ini
> > +*.fdf.inc diff=ini
> > +*.inf diff=ini
> >
>
> I think we can place the attributes list simply into ".gitattributes",
> in the project root. Then git will pick it up automatically. (I guess I
> should have updated the guide a long time ago :/)
We could - but then we'd actually have to either give special
treatment for edk2, or we would override the default behaviour anyway
:)
Mind you, that might still be worthwhile as a "least amount of
surprise" kind of thing, for someone going looking for a
.gitattributes file for edk2.
> either way:
>
> Reviewed-by: Laszlo Ersek <ler...@redhat.com>
Thanks!
/
Leif
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#41819): https://edk2.groups.io/g/devel/message/41819
Mute This Topic: https://groups.io/mt/31870256/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
