From f4acc4fd24a4b88a78c652fa9119c0c3e484ba52 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 30 Oct 2012 09:46:00 +0100
Subject: [PATCH] --- yaml --- r: 338931 b: refs/heads/master c:
 acddedfba0df1e47fa99035a04661082b679ee9c h: refs/heads/master i:   338929:
 6086aaa59a492d780f079c49fe10af46c80fcbe8   338927:
 104da51d217c842ff3181021a37a7c0b51bf1478 v: v3

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

diff --git a/[refs] b/[refs]
index ef858b395915..b65ae28c2e02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd69ef88a7cbe5ad404454ed8f491e6b16b4e86f
+refs/heads/master: acddedfba0df1e47fa99035a04661082b679ee9c
diff --git a/trunk/tools/perf/util/PERF-VERSION-GEN b/trunk/tools/perf/util/PERF-VERSION-GEN
index 95264f304179..f6e8ee29f2ae 100755
--- a/trunk/tools/perf/util/PERF-VERSION-GEN
+++ b/trunk/tools/perf/util/PERF-VERSION-GEN
@@ -12,7 +12,7 @@ LF='
 # First check if there is a .git to get the version from git describe
 # otherwise try to get the version from the kernel makefile
 if test -d ../../.git -o -f ../../.git &&
-	VN=$(git describe --match 'v[0-9].[0-9]*' --abbrev=4 HEAD 2>/dev/null) &&
+	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) &&
 	case "$VN" in
 	*$LF*) (exit 1) ;;
 	v[0-9]*)