From 211bb4cbd9ae6dfa95e8d8501f37d272bde5ab26 Mon Sep 17 00:00:00 2001
From: Yuhui Zheng <10982575+yuhui-zheng@users.noreply.github.com>
Date: Tue, 24 Mar 2020 15:14:24 -0700
Subject: [PATCH] Ignore whitespace when working with patches.

---
 FreeRTOS/Test/CBMC/patches/patch.py   | 2 +-
 FreeRTOS/Test/CBMC/patches/unpatch.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/FreeRTOS/Test/CBMC/patches/patch.py b/FreeRTOS/Test/CBMC/patches/patch.py
index ea53acbe38..e75dafbcb1 100755
--- a/FreeRTOS/Test/CBMC/patches/patch.py
+++ b/FreeRTOS/Test/CBMC/patches/patch.py
@@ -16,7 +16,7 @@ def patch():
     failed_patches = []
     for tmpfile in glob(os.path.join(PATCHES_DIR, "*.patch")):
         print("patch", tmpfile)
-        result = subprocess.run(["git", "apply", tmpfile],
+        result = subprocess.run(["git", "apply", "--ignore-whitespace", tmpfile],
                                 cwd=os.path.join("..", "..", ".."))
         if result.returncode:
             failed_patches.append(tmpfile)
diff --git a/FreeRTOS/Test/CBMC/patches/unpatch.py b/FreeRTOS/Test/CBMC/patches/unpatch.py
index eafe8caccb..689b7b05c8 100755
--- a/FreeRTOS/Test/CBMC/patches/unpatch.py
+++ b/FreeRTOS/Test/CBMC/patches/unpatch.py
@@ -36,7 +36,7 @@ except FileNotFoundError:
     sys.exit(0)
 for tmpfile in glob(os.path.join(PATCHES_DIR, "*.patch")):
     print("unpatch", tmpfile)
-    result = subprocess.run(["git", "apply", "-R", tmpfile],
+    result = subprocess.run(["git", "apply", "-R", "--ignore-whitespace", tmpfile],
                             cwd=os.path.join("..", "..", ".."))
     if result.returncode:
         print("Unpatching failed: {}".format(tmpfile))