summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-22 02:14:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-04-22 02:14:46 (GMT)
commit27ff7878092cf31b66d2fb67b715d632ae5033d7 (patch)
treec8c95f6838ba4e6cd979923318d0ff032824de6e /Makefile
parent078b254deb62d86c469c87ba4200c5a46fcb3a95 (diff)
parent5ee42463399ca3cc75b7e6e4368a3a5df5b010f2 (diff)
downloadgit-27ff7878092cf31b66d2fb67b715d632ae5033d7.zip
git-27ff7878092cf31b66d2fb67b715d632ae5033d7.tar.gz
git-27ff7878092cf31b66d2fb67b715d632ae5033d7.tar.bz2
Merge branch 'js/check-docs-exe'
Dev support update. * js/check-docs-exe: check-docs: fix for setups where executables have an extension check-docs: do not expect guide pages to correspond to commands check-docs: really look at the documented commands again docs: do not document the `git remote-testgit` command docs: move gitremote-helpers into section 7
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c16e75e..9f1b6e8 100644
--- a/Makefile
+++ b/Makefile
@@ -3078,7 +3078,7 @@ ALL_COMMANDS += git-gui git-citool
.PHONY: check-docs
check-docs::
$(MAKE) -C Documentation lint-docs
- @(for v in $(ALL_COMMANDS); \
+ @(for v in $(patsubst %$X,%,$(ALL_COMMANDS)); \
do \
case "$$v" in \
git-merge-octopus | git-merge-ours | git-merge-recursive | \
@@ -3099,15 +3099,16 @@ check-docs::
( \
sed -e '1,/^### command list/d' \
-e '/^#/d' \
+ -e '/guide$$/d' \
-e 's/[ ].*//' \
-e 's/^/listed /' command-list.txt; \
$(MAKE) -C Documentation print-man1 | \
grep '\.txt$$' | \
- sed -e 's|Documentation/|documented |' \
+ sed -e 's|^|documented |' \
-e 's/\.txt//'; \
) | while read how cmd; \
do \
- case " $(ALL_COMMANDS) " in \
+ case " $(patsubst %$X,%,$(ALL_COMMANDS)) " in \
*" $$cmd "*) ;; \
*) echo "removed but $$how: $$cmd" ;; \
esac; \