Page MenuHomePhabricator

D14816.id35822.diff
No OneTemporary

D14816.id35822.diff

diff --git a/src/workflow/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php
--- a/src/workflow/ArcanistPatchWorkflow.php
+++ b/src/workflow/ArcanistPatchWorkflow.php
@@ -691,7 +691,7 @@
Filesystem::writeFile($patchfile, $bundle->toGitPatch());
$passthru = new PhutilExecPassthru(
- 'git apply --index --reject -- %s',
+ 'git apply --whitespace nowarn --index --reject -- %s',
$patchfile);
$passthru->setCWD($repository_api->getPath());
$err = $passthru->execute();

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 7:12 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223891
Default Alt Text
D14816.id35822.diff (536 B)

Event Timeline