https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32b81a91575619e8d13714c1d172f6d1d56845d4
commit 32b81a91575619e8d13714c1d172f6d1d56845d4
Author: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
AuthorDate: Tue Sep 12 17:24:59 2023 +0200
Commit: Hermès Bélusca-Maïto <hermes.belusca-ma...@reactos.org>
CommitDate: Mon Dec 18 22:21:40 2023 +0100
[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 7335a8a37ac..72860f98ce1 100644
--- a/sdk/tools/winesync/winesync.py
+++ b/sdk/tools/winesync/winesync.py
@@ -290,7 +290,7 @@ class wine_sync:
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')
