From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=zz3EfWv6; spf=pass (domain: linaro.org, ip: 209.85.128.67, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by groups.io with SMTP; Mon, 03 Jun 2019 06:02:24 -0700 Received: by mail-wm1-f67.google.com with SMTP id d17so3381995wmb.3 for ; Mon, 03 Jun 2019 06:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=yWRXgw4+yUi/piHtFrBKoWi51S9XgzJ9HMYt2atoSWc=; b=zz3EfWv6UqcAdWLR1v2tAt8BUjHjEXTG3OD3uHAb6cktTElHanVDCFGbqEe7tgzSpE VKa5MxyPeHBXqKKUdicDzFFZ84XztfiqgoTyADR1EBIYC0ykBuYkh1AOKXNGel6qkvBw xgyUNIp/9RFU7G/ycermi/h87aVeOF+CDbgTwH7pZyuynCQZAt1KQO0Y02GQBB0QYJFc OxLrFMdxZdtEgWTZ+I2JQttuQLz1yth9n6Y9KR92hpoUdlT5kH/EyPDIaXqUrjZl5gZh 430GVKuGYjGFxspI058uUMHA1J8yU+b+mDcYay9UHRBgEyA0zwVYx3ySagy9L+B5vjsC PfkA== 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:in-reply-to:user-agent; bh=yWRXgw4+yUi/piHtFrBKoWi51S9XgzJ9HMYt2atoSWc=; b=HDJDZupESgYZAQfShQQeNQ8MyVi7oG30tRa6WqqnzyI07FRefEjE4i3Gj7jtQIQbD1 /GLeGUmxsmiYI0MIxvidMer+Ma4oAVCNKuhuu/AdSJSrHFKLuwX0u0zaZEn/5AWj55PP WrhArjOQew9vauI4xIFgunosXhX6d1+5EaYbA1c7KLohb4aj2K7FD/euQ94yH7wpS4P2 7tSSJ817GXa7pETChsdnJ7HiNNWskKCoMMIj3MzFaeftrEXn7uXLj38nG7znotHvdK7h j8RQlnH5pQBZnZ2IFgh+E+n4Ik5HYfm4tbGr5hDZHFZcX43z3iyNFFiWasuICe0E1Cvr TKfg== X-Gm-Message-State: APjAAAUb1lXOQ0Ewi7V0NcD7buu4iNUnL7sC1XRb/1ohccVHb6eWtaFd sb6KFIi5klwpnuStxnebk9P6Zw== X-Google-Smtp-Source: APXvYqxSonL0LW8FomEG6Lw3b5T2sgvqQU/r/EvySTC4133A+KtfNtiKFr3Sig7skVsqCMm0NaQmwA== X-Received: by 2002:a1c:e183:: with SMTP id y125mr14430222wmg.152.1559566942834; Mon, 03 Jun 2019 06:02:22 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 74sm11529152wma.7.2019.06.03.06.02.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 03 Jun 2019 06:02:22 -0700 (PDT) Date: Mon, 3 Jun 2019 14:02:20 +0100 From: "Leif Lindholm" To: Laszlo Ersek Cc: devel@edk2.groups.io, Bob Feng , Liming Gao , Yonghong Zhu , Andrew Fish , Michael D Kinney Subject: Re: [RFC PATCH 1/2] BaseTools: add centralized location for git config files Message-ID: <20190603130220.2ynjffd6ymmhlmk4@bivouac.eciton.net> References: <20190530155933.25588-2-leif.lindholm@linaro.org> <7a868310-f90c-30f7-8474-980f16865c63@redhat.com> MIME-Version: 1.0 In-Reply-To: <7a868310-f90c-30f7-8474-980f16865c63@redhat.com> User-Agent: NeoMutt/20170113 (1.7.2) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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 > > --- > > 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 Thanks! / Leif