]> Savannah Git Hosting - gnulib.git/commitdiff
maintainer-makefile: Avoid submodule-checks fail without submodules.
authorSimon Josefsson <simon@josefsson.org>
Mon, 7 Apr 2025 06:56:09 +0000 (08:56 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 14 Apr 2025 22:35:50 +0000 (00:35 +0200)
* top/maint.mk (no-submodule-changes): Condition on .gitmodules.
(public-submodule-commit): Likewise.

ChangeLog
top/maint.mk

index 6ae50cd34f0f7e8044dbe7e4bb75389b5e5caff1..96caf549e32e63854ae3866d4262750938ee7cfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-04-07  Simon Josefsson  <simon@josefsson.org>
+
+       maintainer-makefile: Avoid submodule-checks fail without submodules.
+       * top/maint.mk (no-submodule-changes): Condition on .gitmodules.
+       (public-submodule-commit): Likewise.
+
 2025-04-06  Collin Funk  <collin.funk1@gmail.com>
 
        fseterr: Port to recent Haiku snapshots.
index a005fc89b76414c1a6a7a0442ab6acd2426fcf46..a1c23e3effc2345949c3d0c64013c2de448d70a9 100644 (file)
@@ -1623,6 +1623,7 @@ endef
 .PHONY: no-submodule-changes
 no-submodule-changes:
        $(AM_V_GEN)if test -d $(srcdir)/.git                            \
+               && test -e $(srcdir)/.gitmodules                        \
                && git --version >/dev/null 2>&1; then                  \
          diff=$$(cd $(srcdir) && git submodule -q foreach              \
                  git diff-index --name-only HEAD)                      \
@@ -1642,6 +1643,7 @@ submodule-checks ?= no-submodule-changes public-submodule-commit
 .PHONY: public-submodule-commit
 public-submodule-commit:
        $(AM_V_GEN)if test -d $(srcdir)/.git                            \
+               && test -e $(srcdir)/.gitmodules                        \
                && git --version >/dev/null 2>&1; then                  \
          cd $(srcdir) &&                                               \
          git submodule --quiet foreach                                 \