| Message ID | 20200924163509.142565-1-f4bug@amsat.org |
|---|---|
| State | New |
| Headers | show |
| Series | [RFC] scripts/qemu-version.sh: Always describe tag version | expand |
On windows executing
"pkgversion=$(git describe --match 'v*' --dirty --always | echo "")"
$ bash ./scripts/qemu-version.sh . '' ''
#define QEMU_PKGVERSION ""
#define QEMU_FULL_VERSION ""
The result are empty.
By removing echo ""
pkgversion=$(git describe --match 'v*' --dirty --always)
the result are
```
$ bash ./scripts/qemu-version.sh . '' ''
#define QEMU_PKGVERSION "v5.1.0-1922-g94f35f943a-dirty"
#define QEMU_FULL_VERSION " (v5.1.0-1922-g94f35f943a-dirty)"
```
What are expected?
On Fri, Sep 25, 2020 at 12:50 AM Philippe Mathieu-Daudé <f4bug@amsat.org>
wrote:
>
> I'm not sure why sometime I get this error:
>
> $ make
> Generating qemu-version.h with a meson_exe.py custom command
> fatal: No tags can describe 'dc9f825f99eb5dc82f127e6c95fbe3a503e11346'.
> Try --always, or create some tags.
>
> While to --always option is not clear in GIT-DESCRIBE(1):
>
> --always
> Show uniquely abbreviated commit object as fallback.
>
> using it works and fix my builds:
>
> $ git describe --match 'v*' --dirty --always
> dc9f825f99e-dirty
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> 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 03128c56a2c..a7135511588 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 --always | echo
"")
> fi
> fi
>
> --
> 2.26.2
>
>
--
此致
礼
罗勇刚
Yours
sincerely,
Yonggang Luo
<div dir="ltr">On windows executing<div>"pkgversion=$(git describe --match 'v*' --dirty --always | echo "")"</div><div>$ bash ./scripts/qemu-version.sh . '' ''<br>#define QEMU_PKGVERSION ""<br>#define QEMU_FULL_VERSION ""<br><br>The result are empty.<br><br>By removing echo ""<br> pkgversion=$(git describe --match 'v*' --dirty --always)<br>the result are<br>```</div><div>$ bash ./scripts/qemu-version.sh . '' ''<br>#define QEMU_PKGVERSION "v5.1.0-1922-g94f35f943a-dirty"<br>#define QEMU_FULL_VERSION " (v5.1.0-1922-g94f35f943a-dirty)"<br></div><div>```</div><div><br></div><div>What are expected?<br><br><br>On Fri, Sep 25, 2020 at 12:50 AM Philippe Mathieu-Daudé <<a href="mailto:f4bug@amsat.org">f4bug@amsat.org</a>> wrote:<br>><br>> I'm not sure why sometime I get this error:<br>><br>> $ make<br>> Generating qemu-version.h with a meson_exe.py custom command<br>> fatal: No tags can describe 'dc9f825f99eb5dc82f127e6c95fbe3a503e11346'.<br>> Try --always, or create some tags.<br>><br>> While to --always option is not clear in GIT-DESCRIBE(1):<br>><br>> --always<br>> Show uniquely abbreviated commit object as fallback.<br>><br>> using it works and fix my builds:<br>><br>> $ git describe --match 'v*' --dirty --always<br>> dc9f825f99e-dirty<br>><br>> Signed-off-by: Philippe Mathieu-Daudé <<a href="mailto:f4bug@amsat.org">f4bug@amsat.org</a>><br>> ---<br>> scripts/qemu-version.sh | 2 +-<br>> 1 file changed, 1 insertion(+), 1 deletion(-)<br>><br>> diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh<br>> index 03128c56a2c..a7135511588 100755<br>> --- a/scripts/qemu-version.sh<br>> +++ b/scripts/qemu-version.sh<br>> @@ -9,7 +9,7 @@ version="$3"<br>> if [ -z "$pkgversion" ]; then<br>> cd "$dir"<br>> if [ -e .git ]; then<br>> - pkgversion=$(git describe --match 'v*' --dirty | echo "")<br>> + pkgversion=$(git describe --match 'v*' --dirty --always | echo "")<br>> fi<br>> fi<br>><br>> --<br>> 2.26.2<br>><br>><br><br><br>--<br> 此致<br>礼<br>罗勇刚<br>Yours<br> sincerely,<br>Yonggang Luo<br></div></div>
diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh index 03128c56a2c..a7135511588 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 --always | echo "") fi fi
I'm not sure why sometime I get this error: $ make Generating qemu-version.h with a meson_exe.py custom command fatal: No tags can describe 'dc9f825f99eb5dc82f127e6c95fbe3a503e11346'. Try --always, or create some tags. While to --always option is not clear in GIT-DESCRIBE(1): --always Show uniquely abbreviated commit object as fallback. using it works and fix my builds: $ git describe --match 'v*' --dirty --always dc9f825f99e-dirty Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- scripts/qemu-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)