revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-26 08:42:40 +01:00
Code Issues Releases Wiki Activity

Use "--whitespace nowarn" in arc patch to respect trailing whitespace

Browse source 
Summary: Fixes T10008. Git tries to fix some issues by default (apparently? empirically; not consistent with documentation, I think?), but patches from `arc patch` are "always" accurate (disregarding other bugs we might have -- basically, they haven't been emailed or copy/pasted or anything like that) so we can just tell it to apply the patch exactly as-is.

Test Plan: {F1029182}

Reviewers: chad, joshuaspence

Reviewed By: chad, joshuaspence

Maniphest Tasks: T10008

Differential Revision: https://secure.phabricator.com/D14816
This commit is contained in:
epriestley 2015-12-17 16:16:05 -08:00
parent a183c2c4ba
commit 8762e3f367
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/workflow/ArcanistPatchWorkflow.php
View file

@ -691,7 +691,7 @@ EOTEXT
Filesystem::writeFile($patchfile, $bundle->toGitPatch()); Filesystem::writeFile($patchfile, $bundle->toGitPatch());
$passthru = new PhutilExecPassthru( $passthru = new PhutilExecPassthru(
'git apply --index --reject -- %s', 'git apply --whitespace nowarn --index --reject -- %s',
$patchfile); $patchfile);
$passthru->setCWD($repository_api->getPath()); $passthru->setCWD($repository_api->getPath());
$err = $passthru->execute(); $err = $passthru->execute();