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=FmJ5YxnE; spf=pass (domain: linaro.org, ip: 209.85.221.54, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by groups.io with SMTP; Thu, 19 Sep 2019 09:03:36 -0700 Received: by mail-wr1-f54.google.com with SMTP id y19so3698563wrd.3 for ; Thu, 19 Sep 2019 09:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KBT+Hrdo3DFKjd1AATwe6AZmuVaNmWEi+1lu9mW4fhc=; b=FmJ5YxnE32vk3uqq5odbuXMHnLZebjWTHvLcUjVlknAi8ePLcOAVMv7zy/XBNPeRMM Q8hgpGPF4eft7Eytg8GIDucP7l/WnjfOESaj/m8ZmlgS1GpjZ6GC74PFnGsPY3mACh30 ZoqdaSu/lhFePSj8nNtUmcO/A9S7BflyECzpPQr7yjBIqNqBzX2o18l3YgGNJ4B0Ip/Y KFTCrQzOjkOAcGU8vDy5sGdO7uA6L3Xoul67BmkuSyUKV5A0DULOZKSvL3Dbr1WajK9q 2uhH+gQ0SeD92GmE7osqKn66GEB08gxbrXWVVyxHQPeHS4VDRFFuqlUyx1ttNaJ7YMZ+ 0v3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KBT+Hrdo3DFKjd1AATwe6AZmuVaNmWEi+1lu9mW4fhc=; b=ZUQO0gme6DUdicFNwlWWO/gJUn9KuewX11ksZv/SKIMo7w3rp4AMwKDNxGpPUoIcPK LqBHhDhcyAa09vSD+OV/d8KmR9Dj1nVwMUTNo+zTzZ9TXoiJ0tlECkCcm2SCAEdE/ax8 wuQO962lL6hn6SR6Vel4klDT6Txm+ysXKMuK/rScyCKOttqBj17fHc1I6/v/w+81xs8+ y96u6CUzYsyNmhBjITldBAEZ+AJiJqWDT61/dhD/6G6jB7nr9+M4D4N5Fd6tXpvMvejK NYWjLVA19TAwbEO91wFscb0w27W1EE+mFYunGqNpoVkcMEl1Oz531cO43bI9kS9lNBJb sT8Q== X-Gm-Message-State: APjAAAWYBocQ1PfHyvw0oL/C9wqXhK3vHgVrXpL3OJd9V2ncnyYwZyJ3 8Q3ivW3FQ2VNC/VtSsjlQMRhExiS6ac= X-Google-Smtp-Source: APXvYqwMFlAZ81YTBydABGme54r3QayLTMyRRazk3WohXWSo7iKptVJ0Vbbjc2t+rAEnpcawf9xUjQ== X-Received: by 2002:adf:f790:: with SMTP id q16mr8102742wrp.164.1568909013858; Thu, 19 Sep 2019 09:03:33 -0700 (PDT) Return-Path: Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id v4sm15948662wrg.56.2019.09.19.09.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 09:03:32 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH v2 5/9] BaseTools: fix line endings in SetupGit.py Conf files Date: Thu, 19 Sep 2019 17:03:15 +0100 Message-Id: <20190919160319.16270-6-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190919160319.16270-1-leif.lindholm@linaro.org> References: <20190919160319.16270-1-leif.lindholm@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A file header license/copyright header copied around in commit 5b3e695d8ac5 ("BaseTools: add centralized location for git config files") was missing a CR - add it in both faulty locations. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm Reviewed-by: Bob Feng --- BaseTools/Conf/diff.order | 2 +- BaseTools/Conf/gitattributes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/diff.order b/BaseTools/Conf/diff.order index 68b926ca94aa..4361817012c9 100644 --- a/BaseTools/Conf/diff.order +++ b/BaseTools/Conf/diff.order @@ -2,7 +2,7 @@ # Copyright (c) 2019, Linaro Ltd. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent -# +# *.dec *.dsc.inc *.dsc diff --git a/BaseTools/Conf/gitattributes b/BaseTools/Conf/gitattributes index 9b6ab81a475b..58b93e9d4c27 100644 --- a/BaseTools/Conf/gitattributes +++ b/BaseTools/Conf/gitattributes @@ -2,7 +2,7 @@ # Copyright (c) 2019, Linaro Ltd. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent -# +# *.efi -diff *.EFI -diff *.bin -diff -- 2.20.1