Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14035607
D14816.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
536 B
Referenced Files
None
Subscribers
None
D14816.diff
View Options
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
Details
Attached
Mime Type
text/plain
Expires
Mon, Nov 11, 6:43 AM (1 d, 19 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6740067
Default Alt Text
D14816.diff (536 B)
Attached To
Mode
D14816: Use "--whitespace nowarn" in `arc patch` to respect trailing whitespace
Attached
Detach File
Event Timeline
Log In to Comment