From 36086a874dce9f36d6d3d8287e8fd4ff74e942c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 12 Sep 2023 17:24:59 +0200 Subject: [PATCH] [WINESYNC] When initially reverting wine-staging patches, ignore whitespace. This fixes in particular problems when reverting created new files (i.e. they are deleted). I suspect this is due to an endline-format "expectation" from the git apply command. --- sdk/tools/winesync/winesync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/tools/winesync/winesync.py b/sdk/tools/winesync/winesync.py index 8a238b4ac59ee..4599171d91f76 100644 --- a/sdk/tools/winesync/winesync.py +++ b/sdk/tools/winesync/winesync.py @@ -290,7 +290,7 @@ def revert_staged_patchset(self): with open(patch_path, 'rb') as patch_file: try: - subprocess.run(['git', '-C', self.reactos_src, 'apply', '-R', '--reject'], stdin=patch_file, check=True) + subprocess.run(['git', '-C', self.reactos_src, 'apply', '-R', '--ignore-whitespace', '--reject'], stdin=patch_file, check=True) except subprocess.CalledProcessError as err: print(f'Error while reverting patch {patch_file_name}') print('Please check, remove the offending patch with git rm, and relaunch this script')