diff options
| author | Jim Meyering <meyering@fb.com> | 2014-01-01 20:25:44 -0800 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2014-01-01 20:32:33 -0800 |
| commit | 7a0c729aacc3716a665ce3b0c8cb34843bdecc75 (patch) | |
| tree | 6cc247ae3f98c0282c3860c74fa90990242bd32a /top | |
| parent | a39d4083cab589d7cd6a13e8a4b8db8875261d75 (diff) | |
| download | gnulib-7a0c729aacc3716a665ce3b0c8cb34843bdecc75.tar.gz | |
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.
Diffstat (limited to 'top')
| -rw-r--r-- | top/maint.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/top/maint.mk b/top/maint.mk index 7420af5fdb..cae2dda039 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1395,8 +1395,8 @@ public-submodule-commit: && 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 \ |