From 6ccc80409442c2c7f440eb2c84e367a8a53fb135 Mon Sep 17 00:00:00 2001
From: Thijs Lensselink <thijs@lenss.nl>
Date: Tue, 9 Dec 2014 21:41:31 +0100
Subject: [PATCH] Fix #3521 version mismatch when running diag, Replaced git
 command to get current checked out tag

---
 src/Composer/Compiler.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php
index e410c1878..2f1e1888f 100644
--- a/src/Composer/Compiler.php
+++ b/src/Composer/Compiler.php
@@ -55,9 +55,12 @@ class Compiler
         $date->setTimezone(new \DateTimeZone('UTC'));
         $this->versionDate = $date->format('Y-m-d H:i:s');
 
-        $process = new Process('git describe --tags HEAD');
+        $process = new Process('git name-rev --tags --name-only $(git rev-parse HEAD)');
         if ($process->run() == 0) {
-            $this->version = trim($process->getOutput());
+            $output = trim($process->getOutput());
+            if ($output != 'undefined') {
+                $this->version = $output;
+            }
         } else {
             // get branch-alias defined in composer.json for dev-master (if any)
             $localConfig = __DIR__.'/../../composer.json';