From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: [PATCHv2] make-release: fix mtime on rhel6 beta Date: Thu, 24 Jun 2010 20:19:02 +0300 Message-ID: <20100624171902.GA11367@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: avi@redhat.com, kvm@vger.kernel.org, mtosatti@redhat.com, ehabkost@redhat.com Return-path: Received: from mx1.redhat.com ([209.132.183.28]:31082 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970Ab0FXRXz (ORCPT ); Thu, 24 Jun 2010 13:23:55 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5OHNtwX017730 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 24 Jun 2010 13:23:55 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: With recent git versions (like one in rhel6 beta), git prints out tag info in addition to requested format, if passed a tag name. This breaks make-release. To get just the time as we want, we need to pass something that is not a tag name but matches same commit. $commit^{commit} does this. Signed-off-by: Michael S. Tsirkin --- Changes from v1: use ^{commit} for clarity. kvm/scripts/make-release | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kvm/scripts/make-release b/kvm/scripts/make-release index e8051f4..64e77f9 100755 --- a/kvm/scripts/make-release +++ b/kvm/scripts/make-release @@ -51,7 +51,7 @@ cd "$(dirname "$0")"/../.. mkdir -p "$(dirname "$tarball")" git archive --prefix="$name/" --format=tar "$commit" > "$tarball" -mtime=`git show --format=%ct "$commit" --` +mtime=`git show --format=%ct "$commit""^{commit}" --` tarargs="--owner=root --group=root --mtime=@$mtime" mkdir -p "$tmpdir" -- 1.7.1.12.g42b7f