From 0c52a761fbe563f2aa6731fbb18b0572005bc548 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Sun, 12 May 2024 17:07:30 +0200 Subject: [PATCH] maintainer-makefile: Silence announce-gen error with GNULIB_REVISION. * top/maint.mk (gnulib-version): Silence git describe on failure. --- ChangeLog | 5 +++++ top/maint.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e2311e7b2..b6aa21d7f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2024-05-12 Simon Josefsson + + maintainer-makefile: Silence announce-gen error with GNULIB_REVISION. + * top/maint.mk (gnulib-version): Silence git describe on failure. + 2024-05-12 Bruno Haible execinfo: Document known bugs. diff --git a/top/maint.mk b/top/maint.mk index 32228f4366..ecd8971900 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1502,7 +1502,7 @@ vc-diff-check: rel-files = $(DIST_ARCHIVES) gnulib-version = $$(cd $(gnulib_dir) \ - && { git describe || git rev-parse --short=10 HEAD; } ) + && { git describe 2> /dev/null || git rev-parse --short=10 HEAD; } ) bootstrap-tools ?= autoconf,automake,gnulib gpgv = $$(gpgv2 --version >/dev/null && echo gpgv2 || echo gpgv) -- 2.41.0