mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 14:52:40 +01:00
Use "--whitespace nowarn" in arc patch
to respect trailing whitespace
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:
parent
a183c2c4ba
commit
8762e3f367
1 changed files with 1 additions and 1 deletions
|
@ -691,7 +691,7 @@ EOTEXT
|
|||
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();
|
||||
|
|
Loading…
Reference in a new issue