From: Eric Blake <eblake@redhat.com>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, lersek@redhat.com
Subject: Re: [PATCH v2] build-sys: fix git version from -version
Date: Tue, 29 Sep 2020 09:52:59 -0500 [thread overview]
Message-ID: <992e73f1-1670-42ae-c4a7-b333aa0027ba@redhat.com> (raw)
In-Reply-To: <20200929143654.518157-1-marcandre.lureau@redhat.com>
[-- Attachment #1.1: Type: text/plain, Size: 1004 bytes --]
On 9/29/20 9:36 AM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> Typo introduced with the script.
>
> Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> scripts/qemu-version.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Eric Blake <eblake@redhat.com>
> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh
> index 03128c56a2..3f6e7e6d41 100755
> --- a/scripts/qemu-version.sh
> +++ b/scripts/qemu-version.sh
> @@ -9,7 +9,7 @@ version="$3"
> if [ -z "$pkgversion" ]; then
> cd "$dir"
> if [ -e .git ]; then
> - pkgversion=$(git describe --match 'v*' --dirty | echo "")
> + pkgversion=$(git describe --match 'v*' --dirty) || :
> fi
> fi
>
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-09-29 14:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 14:36 [PATCH v2] build-sys: fix git version from -version marcandre.lureau
2020-09-29 14:42 ` 罗勇刚(Yonggang Luo)
2020-09-29 15:33 ` Marc-André Lureau
2020-09-29 15:56 ` 罗勇刚(Yonggang Luo)
2020-09-29 14:52 ` Eric Blake [this message]
2020-10-01 10:17 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=992e73f1-1670-42ae-c4a7-b333aa0027ba@redhat.com \
--to=eblake@redhat.com \
--cc=lersek@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.