From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Taylor Blau <me@ttaylorr.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 1/1] check-docs: fix for setups where executables have an extension
Date: Sun, 24 Mar 2019 11:02:27 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1903241055230.45@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20190322184347.GC12155@Taylors-MacBook-Pro.local>
Hi Taylor,
On Fri, 22 Mar 2019, Taylor Blau wrote:
> On Wed, Mar 13, 2019 at 04:56:53AM -0700, Johannes Schindelin via GitGitGadget wrote:
> > 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 537493822b..df56bf0cd1 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 | \
> > @@ -3103,7 +3103,7 @@ check-docs::
> > -e 's/\.txt//'; \
> > ) | while read how cmd; \
> > do \
> > - case " $(ALL_COMMANDS) " in \
> > + case " $(patsubst %$X,%,$(ALL_COMMANDS)) " in \
>
> I'm a little late to reading this thread, but I was curious why there
> are now two spaces around the patsubst as opposed to the one around
> ALL_COMMANDS?
Sharp eyes, and a *very* good point. The double space is actually required
for this patch to work as intended. I added the following explanation to
the commit message:
Note that `$(ALL_COMMANDS)` starts with a space, and that is rather
crucial for the `while read how cmd` loop: some of the input lines do
not actually have the form `<how> <cmd>`, but only `<cmd>`, therefore
`$cmd` evaluates to the empty string, and when we are looking for
`* $cmd *` in ` $(ALL_COMMANDS)`, we do find it because the latter
starts with a double space.
In other words, the double space helps us skip the lines that list
only a command.
But in this patch, we want to transform `$(ALL_COMMANDS)` via
`$(patsubst ...)` which swallows that double space. To help that, we
prefix the result with *two* spaces instead of just one.
Do you think that is good enough?
Oh, and can I ask you to review *all* of my patches in the future?
Thanks,
Dscho
next prev parent reply other threads:[~2019-03-24 10:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 11:56 [PATCH 0/1] Fix make check-docs on Windows Johannes Schindelin via GitGitGadget
2019-03-13 11:56 ` [PATCH 1/1] check-docs: fix for setups where executables have an extension Johannes Schindelin via GitGitGadget
2019-03-14 1:54 ` Junio C Hamano
2019-03-22 18:43 ` Taylor Blau
2019-03-24 10:02 ` Johannes Schindelin [this message]
2019-03-24 12:54 ` Junio C Hamano
2019-03-25 21:08 ` Johannes Schindelin
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 ` [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
2019-03-29 14:48 ` Johannes Schindelin
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 ` [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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1903241055230.45@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).