Skip to content

Commit

Permalink
[WINESYNC] When initially reverting wine-staging patches, ignore whit…
Browse files Browse the repository at this point in the history
…espace.

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.
  • Loading branch information
HBelusca authored and DarkFire01 committed Sep 12, 2023
1 parent 0524655 commit 36086a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sdk/tools/winesync/winesync.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down

0 comments on commit 36086a8

Please sign in to comment.