From 7cbfd54c14cdfa1abf51d1a7b368050299f23f0c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 30 Oct 2012 09:54:41 +0100
Subject: [PATCH] --- yaml --- r: 338932 b: refs/heads/master c:
 0e2af956693a8797d658d076ff4c0da4147f0131 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b65ae28c2e02..2000fd16d1e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acddedfba0df1e47fa99035a04661082b679ee9c
+refs/heads/master: 0e2af956693a8797d658d076ff4c0da4147f0131
diff --git a/trunk/tools/perf/util/PERF-VERSION-GEN b/trunk/tools/perf/util/PERF-VERSION-GEN
index f6e8ee29f2ae..ac418a1255e6 100755
--- a/trunk/tools/perf/util/PERF-VERSION-GEN
+++ b/trunk/tools/perf/util/PERF-VERSION-GEN
@@ -9,17 +9,12 @@ GVF=${OUTPUT}PERF-VERSION-FILE
 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
+# 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) &&
-	case "$VN" in
-	*$LF*) (exit 1) ;;
-	v[0-9]*)
-		git update-index -q --refresh
-		test -z "$(git diff-index --name-only HEAD --)" ||
-		VN="$VN-dirty" ;;
-	esac
+	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)
 then
 	VN=$(echo "$VN" | sed -e 's/-/./g');
 else