From b0cabd1e989ac7a1fdaac51610e987a833c262e1 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 16 Oct 2014 08:43:09 +0100 Subject: [PATCH] Revert "Added branch-alias for dev-master to ```--version|-V``` output when current", fixes #3356 This reverts commit 225a8f7a5660e12ad53298859a6674293cca3cb9. --- src/Composer/Compiler.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php index 84dfec94d..41c30d6d1 100644 --- a/src/Composer/Compiler.php +++ b/src/Composer/Compiler.php @@ -12,7 +12,6 @@ namespace Composer; -use Composer\Json\JsonFile; use Symfony\Component\Finder\Finder; use Symfony\Component\Process\Process; @@ -45,14 +44,6 @@ class Compiler } $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__); 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.');