From: Laszlo Ersek <lersek@redhat.com>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: pbonzini@redhat.com
Subject: Re: [PATCH v2] build-sys: fix git version from -version
Date: Thu, 1 Oct 2020 12:17:28 +0200 [thread overview]
Message-ID: <961a7c0b-bbd3-e9ec-41a3-f117471cce5e@redhat.com> (raw)
In-Reply-To: <20200929143654.518157-1-marcandre.lureau@redhat.com>
On 09/29/20 16:36, 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(-)
>
> 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
>
>
Reported-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Thanks!
Laszlo
prev parent reply other threads:[~2020-10-01 10:18 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
2020-10-01 10:17 ` Laszlo Ersek [this message]
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=961a7c0b-bbd3-e9ec-41a3-f117471cce5e@redhat.com \
--to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).