Mercurial > hg > octave-shane > gnulib-hg
changeset 17590:b8e838c6fffc
maint: fix public-submodule-commit to work with newer git
* top/maint.mk (public-submodule-commit): Remove excess quoting.
We were over-quoting the test arguments, and somewhere prior to
version 1.8.5.2.229, git stopped removing those excess quotes,
which made the test fail, since the unexpanded strings would
always differ; using GIT_TRACE=1 confirmed that the git merge-base
command wasn't even being run.
| author | Jim Meyering <meyering@fb.com> |
|---|---|
| date | Wed, 01 Jan 2014 20:25:44 -0800 |
| parents | 03a871125624 |
| children | 32afb0830629 |
| files | ChangeLog top/maint.mk |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-01-01 Jim Meyering <meyering@fb.com> + + maint: fix public-submodule-commit to work with newer git + * top/maint.mk (public-submodule-commit): Remove excess quoting. + We were over-quoting the test arguments, and somewhere prior to + version 1.8.5.2.229, git stopped removing those excess quotes, + which made the test fail, since the unexpanded strings would + always differ; using GIT_TRACE=1 confirmed that the git merge-base + command wasn't even being run. + 2014-01-01 Paul Eggert <eggert@cs.ucla.edu> doc: update main copyright year
--- a/top/maint.mk +++ b/top/maint.mk @@ -1395,8 +1395,8 @@ && git --version >/dev/null 2>&1; then \ cd $(srcdir) && \ git submodule --quiet foreach \ - test '"$$(git rev-parse "$$sha1")"' \ - = '"$$(git merge-base origin "$$sha1")"' \ + 'test "$$(git rev-parse "$$sha1")" \ + = "$$(git merge-base origin "$$sha1")"' \ || { echo '$(ME): found non-public submodule commit' >&2; \ exit 1; }; \ else \