[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] maint.mk: handle missing git with more grace
From: |
Peter Rosin |
Subject: |
[PATCH 1/2] maint.mk: handle missing git with more grace |
Date: |
Wed, 31 Oct 2012 15:13:21 +0100 |
* 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 <address@hidden>
---
top/maint.mk | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/top/maint.mk b/top/maint.mk
index ea44ece..8afac72 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; 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; then \
cd $(srcdir) && \
git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \
= '$$(git merge-base origin $$sha1)' \
--
1.7.9