From c3c8f039cf4df629ab9a77de997758982a25589c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=BChnel?= Date: Mon, 24 Feb 2020 17:25:47 +0100 Subject: [PATCH] try fixing whitespaces --- scripts/phabtalk/apply_patch2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/phabtalk/apply_patch2.py b/scripts/phabtalk/apply_patch2.py index ee18c86..8d0616b 100755 --- a/scripts/phabtalk/apply_patch2.py +++ b/scripts/phabtalk/apply_patch2.py @@ -159,7 +159,7 @@ class ApplyPatch: print('Applying diff {} for revision {}...'.format(diff_id, diff_to_str(revision_id))) # TODO: print diff or URL to it diff = try_call(lambda: self.phab.differential.getrawdiff(diffID=str(diff_id)).response) - proc = subprocess.run('git apply --ignore-whitespace -', input=diff, shell=True, text=True, + proc = subprocess.run('git apply --ignore-whitespace --whitespace=fix -', input=diff, shell=True, text=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) if proc.returncode != 0: raise Exception('Applying patch failed:\n{}'.format(proc.stdout + proc.stderr))