From 258a23681fb0e3c6b6031b5dfe049cac0c4a6836 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Fri, 28 Dec 2012 23:13:17 +0100 Subject: [PATCH] maint.mk: handle missing git with more grace * 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 --- ChangeLog | 6 ++++++ top/maint.mk | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index af52d73a13..596762c5ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-12-31 Peter Rosin (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 dup2: work around cygwin bug diff --git a/top/maint.mk b/top/maint.mk index 93c2508ecc..28a84aeacc 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -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")"' \ -- 2.39.5