]> 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)
committerSimon Josefsson <simon@josefsson.org>
Mon, 7 Apr 2025 06:56:09 +0000 (08:56 +0200)
* top/maint.mk (no-submodule-changes): Condition on .gitmodules.
(public-submodule-commit): Likewise.

ChangeLog
top/maint.mk

index b24c4d104b4d2888cf1a59735548bb4ebad96da2..05c48f05da18b3fbeee1ac82aeff17533bf767ff 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 00775f786ff3e6e4db54acfb4b7d956b40f06a4f..54c5e8275307f3d4b3d56d9060be5cf6c46e4109 100644 (file)
@@ -1625,6 +1625,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)                      \
@@ -1644,6 +1645,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                                 \