From a166931e9404a5b42aa9955282d21d09a0a5df6d Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 18 Dec 2015 06:44:53 +0000 Subject: 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. (Sync patch r19104 from main trunk.) 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/branches/UDK2015@19371 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Scripts/PatchCheck.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'BaseTools') diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py index 340a9972b8..455c1309b6 100644 --- 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('+'): -- cgit v1.2.3