[PATCH] make-release: fix mtime on rhel6 beta

[PATCH] make-release: fix mtime on rhel6 beta

[Michael S. Tsirkin]

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~0 does this.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---

Eduardo, you might want to pick this one up too.

 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..cd28275 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"~0 --`
 tarargs="--owner=root --group=root --mtime=@$mtime"
 
 mkdir -p "$tmpdir"
-- 
1.7.1.12.g42b7f

Re: [PATCH] make-release: fix mtime on rhel6 beta

[Eduardo Habkost]

On Thu, Jun 24, 2010 at 06:48:52PM +0300, Michael S. Tsirkin wrote:
> 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~0 does this.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

I suggest using "$commit^{commit}", to make it more clear.

> -mtime=`git show --format=%ct "$commit" --`
> +mtime=`git show --format=%ct "$commit"~0 --`
>  tarargs="--owner=root --group=root --mtime=@$mtime"

-- 
Eduardo

Re: [PATCH] make-release: fix mtime on rhel6 beta

[Michael S. Tsirkin]

On Thu, Jun 24, 2010 at 01:12:04PM -0300, Eduardo Habkost wrote:
> On Thu, Jun 24, 2010 at 06:48:52PM +0300, Michael S. Tsirkin wrote:
> > 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~0 does this.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> 
> I suggest using "$commit^{commit}", to make it more clear.

Since which git version does this work?

> > -mtime=`git show --format=%ct "$commit" --`
> > +mtime=`git show --format=%ct "$commit"~0 --`
> >  tarargs="--owner=root --group=root --mtime=@$mtime"
> 
> -- 
> Eduardo

Re: [PATCH] make-release: fix mtime on rhel6 beta

[Eduardo Habkost]

On Thu, Jun 24, 2010 at 07:09:15PM +0300, Michael S. Tsirkin wrote:
> On Thu, Jun 24, 2010 at 01:12:04PM -0300, Eduardo Habkost wrote:
> > On Thu, Jun 24, 2010 at 06:48:52PM +0300, Michael S. Tsirkin wrote:
> > > 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~0 does this.
> > > 
> > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > 
> > I suggest using "$commit^{commit}", to make it more clear.
> 
> Since which git version does this work?

Since v0.99.9 (October 2005).

-- 
Eduardo