From 2131c8b48082a176565856d69c6273047c96a6dc Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Tue, 9 Dec 2014 22:39:59 +0000 Subject: [PATCH] Simplify tag probe --- src/Composer/Compiler.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php index 2f1e1888f..8697d8caf 100644 --- a/src/Composer/Compiler.php +++ b/src/Composer/Compiler.php @@ -55,12 +55,9 @@ class Compiler $date->setTimezone(new \DateTimeZone('UTC')); $this->versionDate = $date->format('Y-m-d H:i:s'); - $process = new Process('git name-rev --tags --name-only $(git rev-parse HEAD)'); + $process = new Process('git describe --tags --exact-match HEAD'); if ($process->run() == 0) { - $output = trim($process->getOutput()); - if ($output != 'undefined') { - $this->version = $output; - } + $this->version = trim($process->getOutput()); } else { // get branch-alias defined in composer.json for dev-master (if any) $localConfig = __DIR__.'/../../composer.json';