public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Revert "Added branch-alias for dev-master to ```--version|-V``` output when current", fixes #3356 

This reverts commit 225a8f7a56.
pull/3357/merge
Jordi Boggiano 2014-10-16 08:43:09 +01:00
parent c33c5196b1
commit b0cabd1e98
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Composer/Compiler.php
View File

@ -12,7 +12,6 @@
namespace Composer; namespace Composer;
use Composer\Json\JsonFile;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Symfony\Component\Process\Process; use Symfony\Component\Process\Process;
@ -45,14 +44,6 @@ class Compiler
} }
$this->version = trim($process->getOutput()); $this->version = trim($process->getOutput());
$localConfig = __DIR__.'/../../composer.json';
$file = new JsonFile($localConfig);
$localConfig = $file->read();
if (isset($localConfig['extra']['branch-alias']['dev-master'])) {
$this->version = sprintf('%s (%s)', $localConfig['extra']['branch-alias']['dev-master'], $this->version);
}
$process = new Process('git log -n1 --pretty=%ci HEAD', __DIR__); $process = new Process('git log -n1 --pretty=%ci HEAD', __DIR__);
if ($process->run() != 0) { if ($process->run() != 0) {
throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.'); throw new \RuntimeException('Can\'t run git log. You must ensure to run compile from composer git repository clone and that git binary is available.');