From 103733f8e63b009b4f311e2df6bf32d5463082c7 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Thu, 3 Dec 2015 08:18:00 +0000 Subject: [PATCH] BaseTools PatchCheck.py: Support binary diff This allows a patch with binary data that is generated with --binary to be parsed by the PatchCheck.py script. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jordan Justen Reviewed-by: Liming Gao git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19104 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Scripts/PatchCheck.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 340a9972b8..455c1309b6 100755 --- a/BaseTools/Scripts/PatchCheck.py +++ b/BaseTools/Scripts/PatchCheck.py @@ -285,6 +285,10 @@ class GitDiffCheck: self.set_filename(line[6:].rstrip()) if line.startswith('@@ '): self.state = PATCH + self.binary = False + elif line.startswith('GIT binary patch'): + self.state = PATCH + self.binary = True else: ok = False for pfx in self.pre_patch_prefixes: @@ -294,6 +298,8 @@ class GitDiffCheck: self.format_error("didn't find diff hunk marker (@@)") self.line_num += 1 elif self.state == PATCH: + if self.binary: + pass if line.startswith('-'): pass elif line.startswith('+'): -- 2.39.2