From c286b036638e762412fd5d9f201022908870fe9f Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Tue, 30 Oct 2012 13:44:40 -0200
Subject: [PATCH] --- yaml --- r: 338933 b: refs/heads/master c:
 688b2c2f17943d48bccbaad4c43430ee68c4c1cd h: refs/heads/master i:   338931:
 f4acc4fd24a4b88a78c652fa9119c0c3e484ba52 v: v3

---
 [refs]                                 | 2 +-
 trunk/tools/perf/util/PERF-VERSION-GEN | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2000fd16d1e6..33c200e4a8ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e2af956693a8797d658d076ff4c0da4147f0131
+refs/heads/master: 688b2c2f17943d48bccbaad4c43430ee68c4c1cd
diff --git a/trunk/tools/perf/util/PERF-VERSION-GEN b/trunk/tools/perf/util/PERF-VERSION-GEN
index ac418a1255e6..6aa34e5afdcf 100755
--- a/trunk/tools/perf/util/PERF-VERSION-GEN
+++ b/trunk/tools/perf/util/PERF-VERSION-GEN
@@ -14,8 +14,9 @@ LF='
 # otherwise try to get the version from the kernel Makefile
 #
 if test -d ../../.git -o -f ../../.git &&
-	VN=$(echo $(git tag -l "v[0-9].[0-9]*" | tail -1)"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD) 2>/dev/null)
+	VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*")
 then
+	VN=$(echo $VN"-g"$(git log -1 --abbrev=4 --pretty=format:"%h" HEAD))
 	VN=$(echo "$VN" | sed -e 's/-/./g');
 else
 	VN=$(MAKEFLAGS= make -sC ../.. kernelversion)