1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-10 00:42:40 +01:00

Minor, fix inverted condition.

This commit is contained in:
epriestley 2012-03-23 08:53:47 -07:00
parent 61957c4ade
commit 3991e679e7

View file

@ -128,6 +128,8 @@ EOTEXT
$use_squash = !$this->isHistoryImmutable();
}
var_dump($use_squash);
$repository_api = $this->getRepositoryAPI();
if (!($repository_api instanceof ArcanistGitAPI)) {
throw new ArcanistUsageException("'arc land' only supports git.");
@ -248,7 +250,7 @@ EOTEXT
$repository_api->execxLocal('checkout %s', $onto);
if ($use_squash) {
if (!$use_squash) {
// In immutable histories, do a --no-ff merge to force a merge commit with
// the right message.
chdir($repository_api->getPath());