revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-29 18:22:41 +01:00
Code Issues Releases Wiki Activity

Reset master after unsuccessful push

Browse source 
Test Plan: None.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D4717
This commit is contained in:
vrana 2013-01-28 17:05:09 -08:00
parent 5aa3bc6ec0
commit c45053da4c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/workflow/ArcanistLandWorkflow.php
View file

@ -762,6 +762,12 @@ EOTEXT
if ($err) { if ($err) {
echo phutil_console_format("<bg:red>** PUSH FAILED! **</bg>\n"); echo phutil_console_format("<bg:red>** PUSH FAILED! **</bg>\n");
if ($this->isGit) {
$repository_api->execxLocal('reset --hard HEAD^');
$this->restoreBranch();
throw new ArcanistUsageException(
"'{$cmd}' failed! Fix the error and run 'arc land' again.");
}
throw new ArcanistUsageException( throw new ArcanistUsageException(
"'{$cmd}' failed! Fix the error and push this change manually."); "'{$cmd}' failed! Fix the error and push this change manually.");
} }