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=l5voBESl; spf=pass (domain: linaro.org, ip: 209.85.221.46, mailfrom: leif.lindholm@linaro.org) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by groups.io with SMTP; Wed, 18 Sep 2019 15:43:41 -0700 Received: by mail-wr1-f46.google.com with SMTP id a11so1060477wrx.1 for ; Wed, 18 Sep 2019 15:43:40 -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=J/oTL4jyEIjQniDI7DV4XaHw+R/xYeEXgb6/6BUmlmk=; b=l5voBESlhb3NBFSyr+GRQJtQpoAJybITkTOKBdt2FSfGSZ8KSN4GmV/ixDH+v7UCIz u4uKUiNMExe6V6HlUeAxjAlDHJT+ABvKNhGcgnZT3RamnXEttmLkRYU8inSggow7FazE 796tx11f8Z3EvD4d/eqCODLJhoymiFJ3lqqk1czxDT53ixZBmbZsB/pT47j84o+M/pE2 Rv+s8vh/4vmO+LsKWvjuMcq9R/5SirNlqNjwHF3HWYpZbb9OIc87YT7L3Rg0KvBg3OVJ KMn/HHqMe07FcJ5ikRdXX1Bnov1rZMOCK6p0sxZKuLrD2bFm5gaIuc0/w9/e/4dX/kLa Sd7A== 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=J/oTL4jyEIjQniDI7DV4XaHw+R/xYeEXgb6/6BUmlmk=; b=P4Cvlu8z71MBu3895VS5V+LxxXbOh4J3phDpcThXXzGWpFFggA6ydTbqmw5H7ki5GG zHzt01DYW2tivY/kmcRoZuRnOsgEG7sEnab61UDYo3LKAFhPHNv/Hjd6k+kQycLSlL0z /35MTcHPPqUVbrjdvAZp4F80RV8MX/+valKTwelQGdUwIzycFAK5oWadSCs/3bzdSoUr 81fW6Ow207p1ESCcGWazGQ/wvJ1qZFTQT6lCU4f0zw/HoDWrgZfvmpkVSsxEmL1omqas +ZXEVJ5Nz18/wnMpsnf5THzhmv/shdhC7qWIHMcS9pojP/QaAoNg3BTJTNHnoXw1s0Yy wixg== X-Gm-Message-State: APjAAAWoRq8CfnzoxJGDK5PEurBsp/+K9DlfeHj22qtjPmvhG9jIhJCQ mHPacLbsDjymTDBA5QaUDMgzxb2FlfU= X-Google-Smtp-Source: APXvYqzoF5q7F0jIADx6cif+4ec9xfD0SKXaJVvthZxEQnevZH4Il90I6yyeHPkpKfjPA/cO7L3GZg== X-Received: by 2002:a5d:4247:: with SMTP id s7mr4717466wrr.110.1568846618997; Wed, 18 Sep 2019 15:43:38 -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 y186sm6676950wmd.26.2019.09.18.15.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 15:43:38 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH 5/9] BaseTools: fix line endings in SetupGit.py Conf files Date: Wed, 18 Sep 2019 23:43:27 +0100 Message-Id: <20190918224331.23269-6-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190918224331.23269-1-leif.lindholm@linaro.org> References: <20190918224331.23269-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 --- 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