maint.mk: handle missing git with more grace
authorPeter Rosin <peda@lysator.liu.se>
Fri, 28 Dec 2012 22:13:17 +0000 (23:13 +0100)
committerEric Blake <eblake@redhat.com>
Mon, 31 Dec 2012 22:27:34 +0000 (15:27 -0700)
* top/maint.mk (no-submodule-changes, public-submodule-commit): Quietly
proceed if git is not present.

Copyright-paperwork-exempt: yes
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
ChangeLog
top/maint.mk

index af52d73..596762c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-31  Peter Rosin  <peda@lysator.liu.se>  (tiny change)
+
+       maint.mk: handle missing git with more grace
+       * top/maint.mk (no-submodule-changes, public-submodule-commit):
+       Quietly proceed if git is not present.
+
 2012-12-31  Eric Blake  <eblake@redhat.com>
 
        dup2: work around cygwin bug
index 93c2508..28a84ae 100644 (file)
@@ -1370,7 +1370,8 @@ endef
 
 .PHONY: no-submodule-changes
 no-submodule-changes:
-       $(AM_V_GEN)if test -d $(srcdir)/.git; then                      \
+       $(AM_V_GEN)if test -d $(srcdir)/.git                            \
+               && git --version >/dev/null 2>&1; then                  \
          diff=$$(cd $(srcdir) && git submodule -q foreach              \
                  git diff-index --name-only HEAD)                      \
            || exit 1;                                                  \
@@ -1388,7 +1389,8 @@ submodule-checks ?= no-submodule-changes public-submodule-commit
 # cannot be built from a fresh clone.
 .PHONY: public-submodule-commit
 public-submodule-commit:
-       $(AM_V_GEN)if test -d $(srcdir)/.git; then                      \
+       $(AM_V_GEN)if test -d $(srcdir)/.git                            \
+               && git --version >/dev/null 2>&1; then                  \
          cd $(srcdir) &&                                               \
          git submodule --quiet foreach                                 \
              test '"$$(git rev-parse "$$sha1")"'                       \