From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web12.9619.1593704378107177763 for ; Thu, 02 Jul 2020 08:39:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=HEur8d8q; spf=pass (domain: nuviainc.com, ip: 209.85.221.68, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f68.google.com with SMTP id f18so21004248wrs.0 for ; Thu, 02 Jul 2020 08:39:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PguNNnHPuzvGNL9BYwnJnJlQzBK3LdBqVhPRZVEQtuw=; b=HEur8d8q+xbhq988KSHcatH8fD0T+WpfVn8k3vU81Zv7iKCr3yNyMg+RZmDtDamXT8 yLDCfT7Cy9dvEF75r4nQbcIxKHZIoZaKxejn+NtKlMv1uHMIdKi+MEnD7SAWCKTGTqa9 gd/dMyYyB3Q8wwjK7ihP8WHEE6I0SL2ZW82v6Mr3UKXptyBrJQIPZLqbPiZDDAxqa1I6 b5P6bqM7266BsieyoUG66kUsqt6n6uHpRqZ1pX73yFzmSl+1tblxhmRmiwp0b9A1+4k7 sDJ/rGs6rxiCsn5sPu1Qzgv9EhISa88EBwx7tRGORqSUfs16nSzyzUmZ5w2m4jJQ0RSf du3w== 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=PguNNnHPuzvGNL9BYwnJnJlQzBK3LdBqVhPRZVEQtuw=; b=F78v++F3etMsh8Q5OllrS+gLPpxRU9Wxq5Gz4LynenWTyNNZbYT/sfhm5ijxsoMYkH ptPb4QNGwoQKiYFv3A5N+rVMWjjwjgo3Al4garwr8UBQ/oi2QYronOtVHGLuYi8Rprl3 tjMu7wlMNmhO89U5tQK5ZijnRDD6Ih24e33xEFbcyI1f6+4wMV/EEQNMDJTvXUsD2h4j JxFfmF44MbYNeSNCKsWHEmBTFcaAX6DiiS6IrzySbSvablHjLStiQCYcC8o6V4ULhHBl F5mW9OjbFzbZ5TjXh9eVBnnw+/PneYXeyaZVusNcb7FJNRLvsLtFmS4+rKiwZfwaVTEN xQ5g== X-Gm-Message-State: AOAM531evzA9425x+fGD/2amYwYiiSIG47AdN5TrwAvbXC3F2+0GrFOW Gs10kN3qTSkRHLt5K6cG+3SUwEeNc2R4YuMnu+F73LobvhJsF0iLLNfDOfgDQHbSrufobz1qSOg Ez75Vf+D9H+PbqOBv1qFjZ/Qub3q+gEIE1xpSUl9f2qrp0gCoXOF3lU4tNXKhoKaj5g== X-Google-Smtp-Source: ABdhPJzBXqJVpJcsXA5mCna0HEEiC0c0+gW0zwuuyH6vYoEJGSxrSIcaqpdgML/+AClvKPmj4MssSQ== X-Received: by 2002:a05:6000:111:: with SMTP id o17mr34050507wrx.178.1593704376304; Thu, 02 Jul 2020 08:39:36 -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 e5sm11540205wrs.33.2020.07.02.08.39.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2020 08:39:35 -0700 (PDT) From: "Leif Lindholm" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [PATCH 1/2] BaseTools/PatchCheck.py: add exception for diff orderfile Date: Thu, 2 Jul 2020 16:39:33 +0100 Message-Id: <20200702153934.25262-2-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200702153934.25262-1-leif@nuviainc.com> References: <20200702153934.25262-1-leif@nuviainc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit SetupGit.py adds BaseTools/Conf/diff.order as a diff orderfile, but that file currently has CRLF line endings, which causes all pattern matches to fail and the ordering remaining unaffected. Add an exception to PatchCheck.py (to the existing .gitmodules clause), so that we can merge the fix to the config file. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Leif Lindholm --- BaseTools/Scripts/PatchCheck.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index e38cf61f93da..527761986d4c 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -395,11 +395,12 @@ class GitDiffCheck: # they are identified by their path. # self.force_crlf = False - if self.filename == '.gitmodules': + if self.filename == '.gitmodules' or \ + self.filename == 'BaseTools/Conf/diff.order': # - # .gitmodules is updated by git and uses tabs and LF line - # endings. Do not enforce no tabs and do not enforce - # CR/LF line endings. + # .gitmodules and diff orderfiles are used internally by git + # use tabs and LF line endings. Do not enforce no tabs and + # do not enforce CR/LF line endings. # self.force_crlf = False self.force_notabs = False -- 2.20.1