Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14210:59d4ae9d48d6
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>
| author | Eric Blake <eblake@redhat.com> |
|---|---|
| date | Fri, 21 Jan 2011 15:33:29 -0700 |
| parents | 43ca99200f71 |
| children | 26a04a37c3d3 |
| files | ChangeLog top/maint.mk |
| diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- a/top/maint.mk +++ b/top/maint.mk @@ -1127,8 +1127,8 @@ 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 \