From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
Jonathan Nieder <jrnieder@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH] add a script to diff rendered documentation
Date: Mon, 6 Aug 2018 14:58:54 -0400 [thread overview]
Message-ID: <20180806185853.GA18119@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqy3djnyik.fsf@gitster-ct.c.googlers.com>
On Mon, Aug 06, 2018 at 11:25:07AM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > +while test $# -gt 0
> > +do
> > + case "$1" in
> > + -j)
> > + parallel=${1#-j} ;;
>
> This is curious. Did you mean "-j*)" on the line above this one?
Hmph, yes, I think this was broken even in the original. And after going
through "rev-parse --parseopt", we should have a separate argument
anyway, even for the "stuck" form. Worse, the OPTIONS_SPEC doesn't
mention the argument, so it barfs on "-j4".
I think we need to squash this in:
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 5d5b243384..f483fe427c 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -3,7 +3,7 @@
OPTIONS_SPEC="\
doc-diff [options] <from> <to> [-- <diff-options>]
--
-j parallel argument to pass to make
+j=n parallel argument to pass to make
f force rebuild; do not rely on cached results
"
SUBDIRECTORY_OK=1
@@ -15,7 +15,7 @@ while test $# -gt 0
do
case "$1" in
-j)
- parallel=${1#-j} ;;
+ parallel=$2; shift ;;
-f)
force=t ;;
--)
> Then "script -j" (no explicit number) would get here and autodetect.
> Running the script without any "-j" would also get an empty parallel
> and come here.
Yeah, I think that is the wrong thing. If anything "-j" should behave
like "make -j". However, it looks like "rev-parse --parseopt" doesn't
play well with optional arguments for short-only options. You get "-j",
but then you have no idea whether the next argument is an optional value
for it, or another option entirely. Arguably it should give a blank
string or something (if you have long options, then it uses the
long-stock form, which is fine).
> So "script -j1" would be how a user would say "I want to use exactly
> one process, not any parallelism", which makes sense.
Right, that was the thing I actually wanted to have happen. :)
-Peff
next prev parent reply other threads:[~2018-08-06 18:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-03 20:52 [PATCH] add a script to diff rendered documentation Jeff King
2018-08-03 21:33 ` Eric Sunshine
2018-08-03 21:38 ` Jeff King
2018-08-03 21:44 ` Eric Sunshine
2018-08-03 21:47 ` Junio C Hamano
2018-08-03 22:41 ` Eric Sunshine
2018-08-05 20:49 ` brian m. carlson
2018-08-06 13:39 ` Jeff King
2018-08-06 13:42 ` Jeff King
2018-08-06 15:16 ` Junio C Hamano
2018-08-06 16:57 ` Jeff King
2018-08-06 15:01 ` Jonathan Nieder
2018-08-06 16:42 ` Jeff King
2018-08-06 17:37 ` Jeff King
2018-08-06 18:25 ` Junio C Hamano
2018-08-06 18:58 ` Jeff King [this message]
2018-08-06 19:29 ` Junio C Hamano
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=20180806185853.GA18119@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.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).