From ae02d487a3a4f198e37ca5029ae04abd8976076d Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 1 Nov 2023 17:55:52 -0600 Subject: BaseTools: Update PatchCheck.py to allow whitespace issues in .rtf files Allow .rtf files created by applications such as Notepad to be committed as-is without further manual editing by skipping the requirements for CRLF, no tabs and no trailing whitespace. Signed-off-by: Rebecca Cran Reviewed-by: Liming Gao Acked-by: Laszlo Ersek --- BaseTools/Scripts/PatchCheck.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'BaseTools') diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 900226f18f..7f372d40b5 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -363,6 +363,9 @@ class GitDiffCheck: self.is_newfile = False self.force_crlf = True self.force_notabs = True + if self.filename.endswith('.rtf'): + self.force_crlf = False + self.force_notabs = False if self.filename.endswith('.sh') or \ self.filename.startswith('BaseTools/BinWrappers/PosixLike/') or \ self.filename.startswith('BaseTools/BinPipWrappers/PosixLike/') or \ @@ -416,7 +419,7 @@ class GitDiffCheck: self.format_error("didn't find diff hunk marker (@@)") self.line_num += 1 elif self.state == PATCH: - if self.binary: + if self.binary or self.filename.endswith(".rtf"): pass elif line.startswith('-'): pass -- cgit v1.2.3