* [RFC PATCH 1/2] BaseTools: add centralized location for git config files @ 2019-05-30 15:59 Leif Lindholm 2019-06-03 12:43 ` Laszlo Ersek 0 siblings, 1 reply; 4+ messages in thread From: Leif Lindholm @ 2019-05-30 15:59 UTC (permalink / raw) To: devel Cc: Bob Feng, Liming Gao, Yonghong Zhu, Andrew Fish, Laszlo Ersek, Michael D Kinney 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.lindholm@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 -- 2.11.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [RFC PATCH 1/2] BaseTools: add centralized location for git config files 2019-05-30 15:59 [RFC PATCH 1/2] BaseTools: add centralized location for git config files Leif Lindholm @ 2019-06-03 12:43 ` Laszlo Ersek 2019-06-03 13:02 ` Leif Lindholm 0 siblings, 1 reply; 4+ messages in thread From: Laszlo Ersek @ 2019-06-03 12:43 UTC (permalink / raw) To: Leif Lindholm, devel Cc: Bob Feng, Liming Gao, Yonghong Zhu, Andrew Fish, Michael D Kinney 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.lindholm@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 :/) either way: Reviewed-by: Laszlo Ersek <lersek@redhat.com> ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC PATCH 1/2] BaseTools: add centralized location for git config files 2019-06-03 12:43 ` Laszlo Ersek @ 2019-06-03 13:02 ` Leif Lindholm 2019-06-03 16:17 ` Laszlo Ersek 0 siblings, 1 reply; 4+ messages in thread From: Leif Lindholm @ 2019-06-03 13:02 UTC (permalink / raw) To: Laszlo Ersek Cc: devel, Bob Feng, Liming Gao, Yonghong Zhu, Andrew Fish, Michael D Kinney 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.lindholm@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 <lersek@redhat.com> Thanks! / Leif ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [RFC PATCH 1/2] BaseTools: add centralized location for git config files 2019-06-03 13:02 ` Leif Lindholm @ 2019-06-03 16:17 ` Laszlo Ersek 0 siblings, 0 replies; 4+ messages in thread From: Laszlo Ersek @ 2019-06-03 16:17 UTC (permalink / raw) To: Leif Lindholm Cc: devel, Bob Feng, Liming Gao, Yonghong Zhu, Andrew Fish, Michael D Kinney On 06/03/19 15:02, Leif Lindholm wrote: > 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.lindholm@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. Hmm, yes, I think I missed the significance for edk2-platforms and edk2-non-osi -- as you point out under my comment (2) for [RFC PATCH 2/2]. So, I'm pleased with this as-is. In the future, should we come up with future tweaks, we can submit patches for these files, rather than updating the Wiki. Awesome. :) Thanks Laszlo > >> either way: >> >> Reviewed-by: Laszlo Ersek <lersek@redhat.com> > > Thanks! > > / > Leif > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-03 16:17 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-05-30 15:59 [RFC PATCH 1/2] BaseTools: add centralized location for git config files Leif Lindholm 2019-06-03 12:43 ` Laszlo Ersek 2019-06-03 13:02 ` Leif Lindholm 2019-06-03 16:17 ` Laszlo Ersek
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox