From 2f41af65087fb2460779bc4e7fb62453f79ebae3 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 21 Jan 2011 15:33:29 -0700 Subject: [PATCH] maintainer-makefile: work with older git for submodule check * top/maint.mk (public-submodule-commit): Rewrite to avoid merge-base --independent, which Ubuntu 10.04 git 1.7.0.4 lacks. Reported by Matthias Bolte. Signed-off-by: Eric Blake --- ChangeLog | 5 +++++ top/maint.mk | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d0b2205b..c72b3d834 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-01-21 Eric Blake + maintainer-makefile: work with older git for submodule check + * top/maint.mk (public-submodule-commit): Rewrite to avoid + merge-base --independent, which Ubuntu 10.04 git 1.7.0.4 lacks. + Reported by Matthias Bolte. + bootstrap: minor portability fixes * build-aux/bootstrap (me): Use $me instead of $0 in functions. (usage): Omit leading capital and trailing . on help phrases, per diff --git a/top/maint.mk b/top/maint.mk index d2af3add7..5915814c1 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1127,8 +1127,8 @@ submodule-checks ?= no-submodule-changes public-submodule-commit public-submodule-commit: $(AM_V_GEN)if test -d $(srcdir)/.git; then \ cd $(srcdir) && \ - git submodule --quiet foreach 'test $$(git rev-parse origin)' \ - = '"$$(git merge-base --independent origin $$sha1)"' \ + git submodule --quiet foreach test '$$(git rev-parse $$sha1)' \ + = '$$(git merge-base origin $$sha1)' \ || { echo '$(ME): found non-public submodule commit' >&2; \ exit 1; }; \ else \ -- 2.11.0