From 48e525fa9bd7ab617da2a64da5dfb6c3592f14f3 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Thu, 31 May 2012 11:17:34 -0300 Subject: [PATCH] --- yaml --- r: 310590 b: refs/heads/master c: aa5cdd308ddbb08959534be408eba8ef040b5989 h: refs/heads/master 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 dc8364453aa3..d77df3b3c4cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 114067b69e7b2c691faace0e33db2f04096f668d +refs/heads/master: aa5cdd308ddbb08959534be408eba8ef040b5989 diff --git a/trunk/tools/perf/util/PERF-VERSION-GEN b/trunk/tools/perf/util/PERF-VERSION-GEN index ad73300f7bac..95264f304179 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 --abbrev=4 HEAD 2>/dev/null) && + VN=$(git describe --match 'v[0-9].[0-9]*' --abbrev=4 HEAD 2>/dev/null) && case "$VN" in *$LF*) (exit 1) ;; v[0-9]*)