Ignore whitespace when working with patches.

This commit is contained in:
Yuhui Zheng 2020-03-24 15:14:24 -07:00
parent 8156f64d1c
commit 211bb4cbd9
2 changed files with 2 additions and 2 deletions

View file

@ -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))