diff --git a/src/applications/config/controller/PhabricatorConfigConsoleController.php b/src/applications/config/controller/PhabricatorConfigConsoleController.php --- a/src/applications/config/controller/PhabricatorConfigConsoleController.php +++ b/src/applications/config/controller/PhabricatorConfigConsoleController.php @@ -189,8 +189,13 @@ foreach ($specs as $lib) { $remote_future = $remote_futures[$lib]; - list($err, $stdout) = $remote_future->resolve(); - if ($err) { + try { + list($err, $stdout) = $remote_future->resolvex(); + } catch (CommandException $e) { + + // Better to report git errors than just ignoring them. + phlog($e); + // If this fails for whatever reason, just move on. continue; } @@ -258,13 +263,17 @@ $results = array(); foreach ($log_futures as $lib => $future) { - list($err, $stdout) = $future->resolve(); - if (!$err) { + + try { + list($err, $stdout) = $future->resolvex(); list($hash, $epoch) = explode(' ', $stdout); - } else { + } catch (CommandException $e) { $hash = null; $epoch = null; - } + + // Better to report git errors than just ignoring them. + phlog($e); + } $result = array( 'hash' => $hash,