Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752143Ab3DPFKX (ORCPT ); Tue, 16 Apr 2013 01:10:23 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:55125 "EHLO e23smtp08.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750921Ab3DPFKV (ORCPT ); Tue, 16 Apr 2013 01:10:21 -0400 Message-ID: <516CDAD8.9060709@linux.vnet.ibm.com> Date: Tue, 16 Apr 2013 13:00:08 +0800 From: Runzhen Wang User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130308 Thunderbird/17.0.4 MIME-Version: 1.0 To: acme@redhat.com CC: mingo@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] perf tool: fix the perf --version bug Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13041605-5140-0000-0000-00000309E17A Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1722 Lines: 51 From 4d629cfb265beece1aae2e3fdf603e36a321f785 Mon Sep 17 00:00:00 2001 From: Runzhen Wang Date: Mon, 15 Apr 2013 23:17:15 -0400 Subject: [PATCH] perf tool: fix the perf --version bug The perf --version can't print the right version information when reset it to an earlier commit. For example, at present the version is: # ./perf --version perf version 3.9.rc6.gf8378f then, I reset it to an earlier version, say v3.8-rc7 # git reset --hard v3.8-rc7 # make However, the ./perf --version prints a wrong result: # ./perf --version perf version 3.9.rc6.g836dc9 Using 'git describe' instead of 'git tag' can fix this problem. Signed-off-by: Runzhen Wang --- tools/perf/util/PERF-VERSION-GEN | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 055fef3..ec3dd86 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -14,9 +14,8 @@ LF=' # otherwise try to get the version from the kernel Makefile # if test -d ../../.git -o -f ../../.git && - VN=$(git tag 2>/dev/null | tail -1 | grep -E "v[0-9].[0-9]*") + VN=$(git describe --match 'v[0-9].[0-9]*' --abbrev=4 HEAD 2>/dev/null) 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) -- 1.7.10.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/