Skip to content

Commit 27ff787

Browse files
committed
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
2 parents 078b254 + 5ee4246 commit 27ff787

File tree

8 files changed

+10
-41
lines changed

8 files changed

+10
-41
lines changed

Documentation/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ MAN1_TXT += $(filter-out \
1212
$(wildcard git-*.txt))
1313
MAN1_TXT += git.txt
1414
MAN1_TXT += gitk.txt
15-
MAN1_TXT += gitremote-helpers.txt
1615
MAN1_TXT += gitweb.txt
1716

1817
MAN5_TXT += gitattributes.txt
@@ -30,6 +29,7 @@ MAN7_TXT += gitdiffcore.txt
3029
MAN7_TXT += giteveryday.txt
3130
MAN7_TXT += gitglossary.txt
3231
MAN7_TXT += gitnamespaces.txt
32+
MAN7_TXT += gitremote-helpers.txt
3333
MAN7_TXT += gitrevisions.txt
3434
MAN7_TXT += gitsubmodules.txt
3535
MAN7_TXT += gittutorial-2.txt

Documentation/git-remote-ext.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ begins with `ext::`. Examples:
118118

119119
SEE ALSO
120120
--------
121-
linkgit:gitremote-helpers[1]
121+
linkgit:gitremote-helpers[7]
122122

123123
GIT
124124
---

Documentation/git-remote-fd.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ EXAMPLES
5252

5353
SEE ALSO
5454
--------
55-
linkgit:gitremote-helpers[1]
55+
linkgit:gitremote-helpers[7]
5656

5757
GIT
5858
---

Documentation/git-remote-helpers.txto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
git-remote-helpers
22
==================
33

4-
This document has been moved to linkgit:gitremote-helpers[1].
4+
This document has been moved to linkgit:gitremote-helpers[7].
55

66
Please let the owners of the referring site know so that they can update the
77
link you clicked to get here.

Documentation/git-remote-testgit.txt

Lines changed: 0 additions & 30 deletions
This file was deleted.

Documentation/gitremote-helpers.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gitremote-helpers(1)
1+
gitremote-helpers(7)
22
====================
33

44
NAME
@@ -513,8 +513,6 @@ linkgit:git-remote-ext[1]
513513

514514
linkgit:git-remote-fd[1]
515515

516-
linkgit:git-remote-testgit[1]
517-
518516
linkgit:git-fast-import[1]
519517

520518
GIT

Documentation/urls.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ may be used:
6262

6363
where <address> may be a path, a server and path, or an arbitrary
6464
URL-like string recognized by the specific remote helper being
65-
invoked. See linkgit:gitremote-helpers[1] for details.
65+
invoked. See linkgit:gitremote-helpers[7] for details.
6666

6767
If there are a large number of similarly-named remote repositories and
6868
you want to use a different format for them (such that the URLs you

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3078,7 +3078,7 @@ ALL_COMMANDS += git-gui git-citool
30783078
.PHONY: check-docs
30793079
check-docs::
30803080
$(MAKE) -C Documentation lint-docs
3081-
@(for v in $(ALL_COMMANDS); \
3081+
@(for v in $(patsubst %$X,%,$(ALL_COMMANDS)); \
30823082
do \
30833083
case "$$v" in \
30843084
git-merge-octopus | git-merge-ours | git-merge-recursive | \
@@ -3099,15 +3099,16 @@ check-docs::
30993099
( \
31003100
sed -e '1,/^### command list/d' \
31013101
-e '/^#/d' \
3102+
-e '/guide$$/d' \
31023103
-e 's/[ ].*//' \
31033104
-e 's/^/listed /' command-list.txt; \
31043105
$(MAKE) -C Documentation print-man1 | \
31053106
grep '\.txt$$' | \
3106-
sed -e 's|Documentation/|documented |' \
3107+
sed -e 's|^|documented |' \
31073108
-e 's/\.txt//'; \
31083109
) | while read how cmd; \
31093110
do \
3110-
case " $(ALL_COMMANDS) " in \
3111+
case " $(patsubst %$X,%,$(ALL_COMMANDS)) " in \
31113112
*" $$cmd "*) ;; \
31123113
*) echo "removed but $$how: $$cmd" ;; \
31133114
esac; \

0 commit comments

Comments
 (0)