* [PATCH v2 1/5] docs: move gitremote-helpers into section 7
2019-03-25 21:41 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
@ 2019-03-25 21:41 ` Johannes Schindelin via GitGitGadget
2019-03-25 21:41 ` [PATCH v2 3/5] check-docs: really look at the documented commands again Johannes Schindelin via GitGitGadget
` (4 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-03-25 21:41 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
It is currently in section 1, but that section is intended for
"Executable programs or shell commands".
A more appropriate place is section 7: "Miscellaneous (including macro
packages and conventions), e.g. man(7), groff(7)".
This issue should have been detected earlier by `make check-docs`, but
was missed due to a bug in that Makefile target (that we are about to
fix).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Documentation/Makefile | 2 +-
Documentation/git-remote-ext.txt | 2 +-
Documentation/git-remote-fd.txt | 2 +-
Documentation/git-remote-helpers.txto | 2 +-
Documentation/git-remote-testgit.txt | 2 +-
Documentation/gitremote-helpers.txt | 2 +-
Documentation/urls.txt | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 26a2342bea..af0e2cf11a 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -12,7 +12,6 @@ MAN1_TXT += $(filter-out \
$(wildcard git-*.txt))
MAN1_TXT += git.txt
MAN1_TXT += gitk.txt
-MAN1_TXT += gitremote-helpers.txt
MAN1_TXT += gitweb.txt
MAN5_TXT += gitattributes.txt
@@ -30,6 +29,7 @@ MAN7_TXT += gitdiffcore.txt
MAN7_TXT += giteveryday.txt
MAN7_TXT += gitglossary.txt
MAN7_TXT += gitnamespaces.txt
+MAN7_TXT += gitremote-helpers.txt
MAN7_TXT += gitrevisions.txt
MAN7_TXT += gitsubmodules.txt
MAN7_TXT += gittutorial-2.txt
diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt
index 3fc5d94336..790e2ca3fe 100644
--- a/Documentation/git-remote-ext.txt
+++ b/Documentation/git-remote-ext.txt
@@ -118,7 +118,7 @@ begins with `ext::`. Examples:
SEE ALSO
--------
-linkgit:gitremote-helpers[1]
+linkgit:gitremote-helpers[7]
GIT
---
diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt
index 80afca866c..0451ceb8a2 100644
--- a/Documentation/git-remote-fd.txt
+++ b/Documentation/git-remote-fd.txt
@@ -52,7 +52,7 @@ EXAMPLES
SEE ALSO
--------
-linkgit:gitremote-helpers[1]
+linkgit:gitremote-helpers[7]
GIT
---
diff --git a/Documentation/git-remote-helpers.txto b/Documentation/git-remote-helpers.txto
index 49233f5d26..6f353ebfd3 100644
--- a/Documentation/git-remote-helpers.txto
+++ b/Documentation/git-remote-helpers.txto
@@ -1,7 +1,7 @@
git-remote-helpers
==================
-This document has been moved to linkgit:gitremote-helpers[1].
+This document has been moved to linkgit:gitremote-helpers[7].
Please let the owners of the referring site know so that they can update the
link you clicked to get here.
diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt
index f791d73c05..b45bfebba5 100644
--- a/Documentation/git-remote-testgit.txt
+++ b/Documentation/git-remote-testgit.txt
@@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in
SEE ALSO
--------
-linkgit:gitremote-helpers[1]
+linkgit:gitremote-helpers[7]
GIT
---
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 9d1459aac6..34a3e60d08 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -1,4 +1,4 @@
-gitremote-helpers(1)
+gitremote-helpers(7)
====================
NAME
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index b05da95788..bc354fe2dc 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -62,7 +62,7 @@ may be used:
where <address> may be a path, a server and path, or an arbitrary
URL-like string recognized by the specific remote helper being
-invoked. See linkgit:gitremote-helpers[1] for details.
+invoked. See linkgit:gitremote-helpers[7] for details.
If there are a large number of similarly-named remote repositories and
you want to use a different format for them (such that the URLs you
--
gitgitgadget
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 3/5] check-docs: really look at the documented commands again
2019-03-25 21:41 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
2019-03-25 21:41 ` [PATCH v2 1/5] docs: move gitremote-helpers into section 7 Johannes Schindelin via GitGitGadget
@ 2019-03-25 21:41 ` Johannes Schindelin via GitGitGadget
2019-03-25 21:41 ` [PATCH v2 2/5] docs: do not document the `git remote-testgit` command Johannes Schindelin via GitGitGadget
` (3 subsequent siblings)
5 siblings, 0 replies; 17+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-03-25 21:41 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
As part of the `check-docs` target, we verify that commands that are
documented are actually in the current list of commands to be built.
However, this logic broke in 5fafce0b78 (check-docs: get documented
command list from Makefile, 2012-08-08), when we tried to make the logic
safer by not looking at the files in the worktree, but at the list of
files to be generated in `Documentation/Makefile`. While this was the
right thing to do, it failed to accommodate for the fact that `make -C
Documentation/ print-man1`, unlike `ls Documentation/*.txt`, would *not*
print lines starting with the prefix `Documentation/`.
At long last, let's fix this.
Note: This went undetected due to a funny side effect of the
`ALL_PROGRAMS` variable starting with a space. That space, together with
the extra space we inserted before `$(ALL_PROGRAMS)` in the
case " $(ALL_PROGRAMS)" in
*" $$cmd ")
[...]
construct, is responsible that this case arm is used when `cmd` is empty
(which was clearly not intended to be the case).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 537493822b..76904f07fe 100644
--- a/Makefile
+++ b/Makefile
@@ -3099,7 +3099,7 @@ check-docs::
-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 \
--
gitgitgadget
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 2/5] docs: do not document the `git remote-testgit` command
2019-03-25 21:41 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
2019-03-25 21:41 ` [PATCH v2 1/5] docs: move gitremote-helpers into section 7 Johannes Schindelin via GitGitGadget
2019-03-25 21:41 ` [PATCH v2 3/5] check-docs: really look at the documented commands again Johannes Schindelin via GitGitGadget
@ 2019-03-25 21:41 ` Johannes Schindelin via GitGitGadget
2019-03-26 14:39 ` Ævar Arnfjörð Bjarmason
2019-03-25 21:41 ` [PATCH v2 4/5] check-docs: do not expect guide pages to correspond to commands Johannes Schindelin via GitGitGadget
` (2 subsequent siblings)
5 siblings, 1 reply; 17+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-03-25 21:41 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Since 7ded055401 (build: do not install git-remote-testgit, 2013-06-07),
we do not install it. Therefore it makes no sense to document it,
either.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Documentation/git-remote-testgit.txt | 30 ----------------------------
Documentation/gitremote-helpers.txt | 2 --
2 files changed, 32 deletions(-)
delete mode 100644 Documentation/git-remote-testgit.txt
diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt
deleted file mode 100644
index b45bfebba5..0000000000
--- a/Documentation/git-remote-testgit.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-git-remote-testgit(1)
-=====================
-
-NAME
-----
-git-remote-testgit - Example remote-helper
-
-
-SYNOPSIS
---------
-[verse]
-git clone testgit::<source-repo> [<destination>]
-
-DESCRIPTION
------------
-
-This command is a simple remote-helper, that is used both as a
-testcase for the remote-helper functionality, and as an example to
-show remote-helper authors one possible implementation.
-
-The best way to learn more is to read the comments and source code in
-'git-remote-testgit'.
-
-SEE ALSO
---------
-linkgit:gitremote-helpers[7]
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index 34a3e60d08..2fc4007525 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -513,8 +513,6 @@ linkgit:git-remote-ext[1]
linkgit:git-remote-fd[1]
-linkgit:git-remote-testgit[1]
-
linkgit:git-fast-import[1]
GIT
--
gitgitgadget
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v2 2/5] docs: do not document the `git remote-testgit` command
2019-03-25 21:41 ` [PATCH v2 2/5] docs: do not document the `git remote-testgit` command Johannes Schindelin via GitGitGadget
@ 2019-03-26 14:39 ` Ævar Arnfjörð Bjarmason
2019-03-27 22:23 ` Johannes Schindelin
0 siblings, 1 reply; 17+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2019-03-26 14:39 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget
Cc: git, Taylor Blau, Junio C Hamano, Johannes Schindelin
On Mon, Mar 25 2019, Johannes Schindelin via GitGitGadget wrote:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> Since 7ded055401 (build: do not install git-remote-testgit, 2013-06-07),
> we do not install it. Therefore it makes no sense to document it,
> either.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> Documentation/git-remote-testgit.txt | 30 ----------------------------
> Documentation/gitremote-helpers.txt | 2 --
> 2 files changed, 32 deletions(-)
> delete mode 100644 Documentation/git-remote-testgit.txt
>
> diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt
> deleted file mode 100644
> index b45bfebba5..0000000000
> --- a/Documentation/git-remote-testgit.txt
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -git-remote-testgit(1)
> -=====================
> -
> -NAME
> -----
> -git-remote-testgit - Example remote-helper
> -
> -
> -SYNOPSIS
> ---------
> -[verse]
> -git clone testgit::<source-repo> [<destination>]
> -
> -DESCRIPTION
> ------------
> -
> -This command is a simple remote-helper, that is used both as a
> -testcase for the remote-helper functionality, and as an example to
> -show remote-helper authors one possible implementation.
> -
> -The best way to learn more is to read the comments and source code in
> -'git-remote-testgit'.
> -
> -SEE ALSO
> ---------
> -linkgit:gitremote-helpers[7]
> -
> -GIT
> ----
> -Part of the linkgit:git[1] suite
> diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
> index 34a3e60d08..2fc4007525 100644
> --- a/Documentation/gitremote-helpers.txt
> +++ b/Documentation/gitremote-helpers.txt
> @@ -513,8 +513,6 @@ linkgit:git-remote-ext[1]
>
> linkgit:git-remote-fd[1]
>
> -linkgit:git-remote-testgit[1]
> -
> linkgit:git-fast-import[1]
I wonder if it should be moved into e.g. t/helper or somesuch at this
point...
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 2/5] docs: do not document the `git remote-testgit` command
2019-03-26 14:39 ` Ævar Arnfjörð Bjarmason
@ 2019-03-27 22:23 ` Johannes Schindelin
2019-03-29 14:48 ` Johannes Schindelin
0 siblings, 1 reply; 17+ messages in thread
From: Johannes Schindelin @ 2019-03-27 22:23 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: Johannes Schindelin via GitGitGadget, git, Taylor Blau, Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 2856 bytes --]
Hi Ævar,
On Tue, 26 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
> On Mon, Mar 25 2019, Johannes Schindelin via GitGitGadget wrote:
>
> > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> >
> > Since 7ded055401 (build: do not install git-remote-testgit, 2013-06-07),
> > we do not install it. Therefore it makes no sense to document it,
> > either.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > ---
> > Documentation/git-remote-testgit.txt | 30 ----------------------------
> > Documentation/gitremote-helpers.txt | 2 --
> > 2 files changed, 32 deletions(-)
> > delete mode 100644 Documentation/git-remote-testgit.txt
> >
> > diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt
> > deleted file mode 100644
> > index b45bfebba5..0000000000
> > --- a/Documentation/git-remote-testgit.txt
> > +++ /dev/null
> > @@ -1,30 +0,0 @@
> > -git-remote-testgit(1)
> > -=====================
> > -
> > -NAME
> > -----
> > -git-remote-testgit - Example remote-helper
> > -
> > -
> > -SYNOPSIS
> > ---------
> > -[verse]
> > -git clone testgit::<source-repo> [<destination>]
> > -
> > -DESCRIPTION
> > ------------
> > -
> > -This command is a simple remote-helper, that is used both as a
> > -testcase for the remote-helper functionality, and as an example to
> > -show remote-helper authors one possible implementation.
> > -
> > -The best way to learn more is to read the comments and source code in
> > -'git-remote-testgit'.
> > -
> > -SEE ALSO
> > ---------
> > -linkgit:gitremote-helpers[7]
> > -
> > -GIT
> > ----
> > -Part of the linkgit:git[1] suite
> > diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
> > index 34a3e60d08..2fc4007525 100644
> > --- a/Documentation/gitremote-helpers.txt
> > +++ b/Documentation/gitremote-helpers.txt
> > @@ -513,8 +513,6 @@ linkgit:git-remote-ext[1]
> >
> > linkgit:git-remote-fd[1]
> >
> > -linkgit:git-remote-testgit[1]
> > -
> > linkgit:git-fast-import[1]
>
> I wonder if it should be moved into e.g. t/helper or somesuch at this
> point...
Sure.
One thing to keep in mind is that we cannot change the actual name of the
executable, as it needs to have the format `git-remote-*`, and cannot
require a first argument `testgit`, to be able to perform its purpose.
We do have a precedent for that kind of scenario: `test-fake-ssh`. It is
also not folded into `test-tool`, and it is copied while changing the name
to `ssh`, as required to fulfill its mission.
I am not totally enthusiastic about this because this is what prevents
Git's test suite from running in a RAM disk on Windows, IIRC: I have not
been able to convince my RAM disk provider to allow executables stored on
it to be executed.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 2/5] docs: do not document the `git remote-testgit` command
2019-03-27 22:23 ` Johannes Schindelin
@ 2019-03-29 14:48 ` Johannes Schindelin
0 siblings, 0 replies; 17+ messages in thread
From: Johannes Schindelin @ 2019-03-29 14:48 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason
Cc: Johannes Schindelin via GitGitGadget, git, Taylor Blau, Junio C Hamano
[-- Attachment #1: Type: text/plain, Size: 3306 bytes --]
Hi Ævar,
On Wed, 27 Mar 2019, Johannes Schindelin wrote:
> On Tue, 26 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
> > On Mon, Mar 25 2019, Johannes Schindelin via GitGitGadget wrote:
> >
> > > From: Johannes Schindelin <johannes.schindelin@gmx.de>
> > >
> > > Since 7ded055401 (build: do not install git-remote-testgit, 2013-06-07),
> > > we do not install it. Therefore it makes no sense to document it,
> > > either.
> > >
> > > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> > > ---
> > > Documentation/git-remote-testgit.txt | 30 ----------------------------
> > > Documentation/gitremote-helpers.txt | 2 --
> > > 2 files changed, 32 deletions(-)
> > > delete mode 100644 Documentation/git-remote-testgit.txt
> > >
> > > diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt
> > > deleted file mode 100644
> > > index b45bfebba5..0000000000
> > > --- a/Documentation/git-remote-testgit.txt
> > > +++ /dev/null
> > > @@ -1,30 +0,0 @@
> > > -git-remote-testgit(1)
> > > -=====================
> > > -
> > > -NAME
> > > -----
> > > -git-remote-testgit - Example remote-helper
> > > -
> > > -
> > > -SYNOPSIS
> > > ---------
> > > -[verse]
> > > -git clone testgit::<source-repo> [<destination>]
> > > -
> > > -DESCRIPTION
> > > ------------
> > > -
> > > -This command is a simple remote-helper, that is used both as a
> > > -testcase for the remote-helper functionality, and as an example to
> > > -show remote-helper authors one possible implementation.
> > > -
> > > -The best way to learn more is to read the comments and source code in
> > > -'git-remote-testgit'.
> > > -
> > > -SEE ALSO
> > > ---------
> > > -linkgit:gitremote-helpers[7]
> > > -
> > > -GIT
> > > ----
> > > -Part of the linkgit:git[1] suite
> > > diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
> > > index 34a3e60d08..2fc4007525 100644
> > > --- a/Documentation/gitremote-helpers.txt
> > > +++ b/Documentation/gitremote-helpers.txt
> > > @@ -513,8 +513,6 @@ linkgit:git-remote-ext[1]
> > >
> > > linkgit:git-remote-fd[1]
> > >
> > > -linkgit:git-remote-testgit[1]
> > > -
> > > linkgit:git-fast-import[1]
> >
> > I wonder if it should be moved into e.g. t/helper or somesuch at this
> > point...
>
> Sure.
>
> One thing to keep in mind is that we cannot change the actual name of the
> executable, as it needs to have the format `git-remote-*`, and cannot
> require a first argument `testgit`, to be able to perform its purpose.
>
> We do have a precedent for that kind of scenario: `test-fake-ssh`. It is
> also not folded into `test-tool`, and it is copied while changing the name
> to `ssh`, as required to fulfill its mission.
>
> I am not totally enthusiastic about this because this is what prevents
> Git's test suite from running in a RAM disk on Windows, IIRC: I have not
> been able to convince my RAM disk provider to allow executables stored on
> it to be executed.
Oh you know what? `git-remote-testgit` is a *shell script*.
So that one was easy...
Now, the question is really, should I just add this patch *here*, or to
the non-Windows-related docs fixes I have lined up?
Decisions, decisions.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 4/5] check-docs: do not expect guide pages to correspond to commands
2019-03-25 21:41 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
` (2 preceding siblings ...)
2019-03-25 21:41 ` [PATCH v2 2/5] docs: do not document the `git remote-testgit` command Johannes Schindelin via GitGitGadget
@ 2019-03-25 21:41 ` Johannes Schindelin via GitGitGadget
2019-03-25 21:41 ` [PATCH v2 5/5] check-docs: fix for setups where executables have an extension Johannes Schindelin via GitGitGadget
2019-03-26 14:38 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin
5 siblings, 0 replies; 17+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-03-25 21:41 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
When we want to see what commands are listed in `command-list.txt` but
not installed, we currently include lines that refer to guides, e.g.
`gitattributes` or `gitcli`.
Let's not include those lines, as they are not referring to commands.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 76904f07fe..c7b884cd38 100644
--- a/Makefile
+++ b/Makefile
@@ -3095,6 +3095,7 @@ 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 | \
--
gitgitgadget
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 5/5] check-docs: fix for setups where executables have an extension
2019-03-25 21:41 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
` (3 preceding siblings ...)
2019-03-25 21:41 ` [PATCH v2 4/5] check-docs: do not expect guide pages to correspond to commands Johannes Schindelin via GitGitGadget
@ 2019-03-25 21:41 ` Johannes Schindelin via GitGitGadget
2019-03-26 14:38 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin
5 siblings, 0 replies; 17+ messages in thread
From: Johannes Schindelin via GitGitGadget @ 2019-03-25 21:41 UTC (permalink / raw)
To: git; +Cc: Taylor Blau, Junio C Hamano, Johannes Schindelin
From: Johannes Schindelin <johannes.schindelin@gmx.de>
On Windows, for example, executables (must) have the extension `.exe`.
Our `check-docs` target was not prepared for that.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index c7b884cd38..2cd650e7b9 100644
--- a/Makefile
+++ b/Makefile
@@ -3074,7 +3074,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 | \
@@ -3104,7 +3104,7 @@ check-docs::
-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; \
--
gitgitgadget
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v2 0/5] Fix make check-docs on Windows
2019-03-25 21:41 ` [PATCH v2 0/5] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
` (4 preceding siblings ...)
2019-03-25 21:41 ` [PATCH v2 5/5] check-docs: fix for setups where executables have an extension Johannes Schindelin via GitGitGadget
@ 2019-03-26 14:38 ` Johannes Schindelin
5 siblings, 0 replies; 17+ messages in thread
From: Johannes Schindelin @ 2019-03-26 14:38 UTC (permalink / raw)
To: Johannes Schindelin via GitGitGadget; +Cc: git, Taylor Blau, Junio C Hamano
Hi,
On Mon, 25 Mar 2019, Johannes Schindelin via GitGitGadget wrote:
> Johannes Schindelin (5):
> docs: move gitremote-helpers into section 7
> docs: do not document the `git remote-testgit` command
> check-docs: really look at the documented commands again
> check-docs: do not expect guide pages to correspond to commands
> check-docs: fix for setups where executables have an extension
FWIW I am also working on a follow-up patch series [*1*] that resolves all
issues reported by `make check-docs` on Windows, but I do not want to make
this here patch series even bigger (from an initial single, relatively
small patch).
Ciao,
Johannes
Foontote *1*: Tracked here: https://github.com/gitgitgadget/git/pull/168
^ permalink raw reply [flat|nested] 17+ messages in thread