mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-10 00:42:40 +01:00
Allow upgrading in branch stable
Summary: close T9043. This still allows for one dir to be in `master` and the other in `stable`, but hopefully that's not going to be a problem. Test Plan: Clone arc/libph, checkout `stable`, run arc upgrade. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: cburroughs, epriestley Maniphest Tasks: T9043 Differential Revision: https://secure.phabricator.com/D14076
This commit is contained in:
parent
55d9cc7013
commit
8f3a002cdb
1 changed files with 4 additions and 4 deletions
|
@ -53,18 +53,18 @@ EOTEXT
|
|||
|
||||
$this->setRepositoryAPI($repository);
|
||||
|
||||
// Require no local changes.
|
||||
$this->requireCleanWorkingCopy();
|
||||
|
||||
// Require the library be on master.
|
||||
$branch_name = $repository->getBranchName();
|
||||
if ($branch_name != 'master') {
|
||||
if ($branch_name != 'master' && $branch_name != 'stable') {
|
||||
throw new ArcanistUsageException(
|
||||
pht(
|
||||
"%s must be on branch '%s' to be automatically upgraded. ".
|
||||
"%s must be on either branch '%s' or '%s' to be automatically ".
|
||||
"upgraded. ".
|
||||
"This copy of %s (in '%s') is on branch '%s'.",
|
||||
$lib,
|
||||
'master',
|
||||
'stable',
|
||||
$lib,
|
||||
$root,
|
||||
$branch_name));
|
||||
|
|
Loading…
Reference in a new issue