From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C4C6C28CC0 for ; Thu, 30 May 2019 08:14:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E48025778 for ; Thu, 30 May 2019 08:14:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=zytor.com header.i=@zytor.com header.b="KSESlhYv" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726911AbfE3IOW (ORCPT ); Thu, 30 May 2019 04:14:22 -0400 Received: from terminus.zytor.com ([198.137.202.136]:43325 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726386AbfE3IOW (ORCPT ); Thu, 30 May 2019 04:14:22 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id x4U8E4512904717 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Thu, 30 May 2019 01:14:04 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 terminus.zytor.com x4U8E4512904717 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2019051801; t=1559204045; bh=YocNR03LztEIRwgfs2gHJqyMB8B1v6MAyp624O+VnD4=; h=Date:From:Cc:Reply-To:To:Subject:From; b=KSESlhYvCJZCQwpDtsiRjusrRE2dtP2bDnhzNci9UGr1M10zOTNN2EGr/2j5VtdoD +HbO3A8DdaT7/AVt7y9xJfy5BvdbfGvdfQXOfZgbA8LshxH8TspKF+cTQb2/gSh0BM KJT1EuOljOd5MaEVV1Xt3+78duetBJ6xI6mYqB9ASK9iVNB46LLUkE1YWoyzGdlIUr /jasnH2hq5SH0LfGwj7TL5JiUpVrRavqLyMzGrQSnryuJoDYQFBMKSzWAApZC3PlQB QoCn4UKLcn/RJCs+x2rk/A8EEcGrhFXfPEmoBwE4taYz+QjQRZHYcaRJX5dLCM+hJm 1Y1z+sriHPPAw== Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id x4U8E4F62904714; Thu, 30 May 2019 01:14:04 -0700 Date: Thu, 30 May 2019 01:14:04 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, namhyung@kernel.org Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, mingo@kernel.org, jolsa@kernel.org, acme@redhat.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf version: Append 12 git SHA chars to the version string Git-Commit-ID: 80ec26d110c5c5a81b60c444db851e5734dee09a X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 80ec26d110c5c5a81b60c444db851e5734dee09a Gitweb: https://git.kernel.org/tip/80ec26d110c5c5a81b60c444db851e5734dee09a Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 24 May 2019 15:50:18 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 28 May 2019 18:37:44 -0300 perf version: Append 12 git SHA chars to the version string Bumping it from just 4: Before: $ perf -v perf version 5.2.rc1.g80978f $ After: $ perf -v perf version 5.2.rc1.g80978fc864c5 $ Requested-by: Ingo Molnar Cc: Adrian Hunter Cc: Jiri Olsa Cc: Namhyung Kim Link: https://lkml.kernel.org/n/tip-p4yun2nxlo7eeeohyx5v4kw7@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/PERF-VERSION-GEN | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/PERF-VERSION-GEN b/tools/perf/util/PERF-VERSION-GEN index 3802cee5e188..59241ff342be 100755 --- a/tools/perf/util/PERF-VERSION-GEN +++ b/tools/perf/util/PERF-VERSION-GEN @@ -19,7 +19,7 @@ TAG= if test -d ../../.git -o -f ../../.git then TAG=$(git describe --abbrev=0 --match "v[0-9].[0-9]*" 2>/dev/null ) - CID=$(git log -1 --abbrev=4 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" + CID=$(git log -1 --abbrev=12 --pretty=format:"%h" 2>/dev/null) && CID="-g$CID" elif test -f ../../PERF-VERSION-FILE then TAG=$(cut -d' ' -f3 ../../PERF-VERSION-FILE | sed -e 's/\"//g')