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 <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 8d0b2205b026ae400f85d569ed02ef4f413db5b2..c72b3d834f8e57f4c952189d471b09331ed353b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-01-21  Eric Blake  <eblake@redhat.com>
 
+       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 d2af3add70f7f38ba53a6bd152215928e14f8280..5915814c11b32d6b38d3ece853febc7dc3f9c482 100644 (file)
--- 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                                                            \