make-release: fix mtime for a wider range of git versions

Submitted by Bernhard Kohl on Nov. 15, 2010, 11:48 a.m.

Details

Message ID 1289821724-24845-1-git-send-email-bernhard.kohl@nsn.com
State New
Headers show

Commit Message

Bernhard Kohl Nov. 15, 2010, 11:48 a.m.
With the latest git versions, e.g. 1.7.2.3, git still prints out
the tag info in addition to the requested format. So let's simply
fetch the first line from the output.

In addition I use the --pretty option instead of --format which
is not recognized in very old git versions, e.g. 1.5.5.6.

Tested with git versions 1.5.5.6 and 1.7.2.3.

Signed-off-by: Bernhard Kohl <bernhard.kohl@nsn.com>
---
 kvm/scripts/make-release |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Bernhard Kohl Nov. 15, 2010, 5:03 p.m.
Am 15.11.2010 12:48, schrieb Bernhard Kohl:
> With the latest git versions, e.g. 1.7.2.3, git still prints out
> the tag info in addition to the requested format. So let's simply
> fetch the first line from the output.
>
> In addition I use the --pretty option instead of --format which
> is not recognized in very old git versions, e.g. 1.5.5.6.
>
> Tested with git versions 1.5.5.6 and 1.7.2.3.
>
> Signed-off-by: Bernhard Kohl<bernhard.kohl@nsn.com>
>    

Sorry, I sent this to the wrong list. Resent to kvm!

Bernhard

> ---
>   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 56302c3..2d050fc 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""^{commit}" --`
> +mtime=`git show --pretty=format:%ct "$commit""^{commit}" -- | head -n 1`
>   tarargs="--owner=root --group=root"
>
>   mkdir -p "$tmpdir/$name"
>

Patch hide | download patch | download mbox

diff --git a/kvm/scripts/make-release b/kvm/scripts/make-release
index 56302c3..2d050fc 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""^{commit}" --`
+mtime=`git show --pretty=format:%ct "$commit""^{commit}" -- | head -n 1`
 tarargs="--owner=root --group=root"
 
 mkdir -p "$tmpdir/$name"