mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-10 00:42:40 +01:00
Make the rule for applying git diff less restrict
Summary: the current command to apply a git diff is 'git apply --index', which will fail the whole patch and does not touch the working tree when some of the hunks do not apply. We want to allow the user to patch the ones which apply. Test Plan: run 'arc apply' against a diff whcih partially applies and verify that the hunks which apply are applied, and .rej files are generated for the rest. Reviewed By: simpkins Reviewers: simpkins, epriestley Commenters: ju CC: aran, slawekbiel, simpkins, ju Differential Revision: 235
This commit is contained in:
parent
64ecf63680
commit
8f59aff31a
1 changed files with 1 additions and 1 deletions
|
@ -368,7 +368,7 @@ EOTEXT
|
||||||
return $patch_err;
|
return $patch_err;
|
||||||
} else {
|
} else {
|
||||||
$future = new ExecFuture(
|
$future = new ExecFuture(
|
||||||
'(cd %s; git apply --index)',
|
'(cd %s; git apply --index --reject)',
|
||||||
$repository_api->getPath());
|
$repository_api->getPath());
|
||||||
$future->write($bundle->toGitPatch());
|
$future->write($bundle->toGitPatch());
|
||||||
$future->resolvex();
|
$future->resolvex();
|
||||||
|
|
Loading…
Reference in a new issue