From: Todd Zullinger <tmz@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] doc/ls-files: put nested list for "-t" option into block
Date: Tue, 23 Apr 2019 22:03:13 -0400 [thread overview]
Message-ID: <20190424020313.GP3654@pobox.com> (raw)
In-Reply-To: <20190422151541.GA1633@sigill.intra.peff.net>
Hi,
Jeff King wrote:
> The description for the "-t" option contains a sub-list of all of the
> possible file status outputs. But because of the newline separating that
> list from the description paragraph, asciidoc treats the sub-list
> entries as a continuation of the overall options list, rather than as
> children of the "-t" description.
>
> We could fix it by adding a "+" before the sub-list to connect it to the
> rest of the "-t" text. But using a pair of "--" to delimit the block is
> perhaps more readable, and may have better compatibility with
> asciidoctor, as in 39a869b2f2 (Documentation/rev-list-options: wrap
> --date=<format> block with "--", 2019-03-30).
>
> The extra blank line comes from 5bc0e247c4 (Document ls-files -t as
> semi-obsolete., 2010-07-28), but the problem actually seems older than
> that. Before then, we did:
>
> -t:: some text...
> H:: cached
> M:: unmerged
> etc...
>
> but asciidoc also treats that as one big list. So this problem seems to
> have been around forever.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Junio: I happened to notice this while hunting for "ls-files" options
> that could make your makefile de-dup patch unnecessary (but
> didn't find anything).
>
> Todd: Just an FYI that your "--" strategy is spreading. :)
Heh, cool. This is an obviously simple fix, but for good
measure I checked the results with asciidoc 8.6.10 as well
as asciidoctor 1.5.6 and 2.0.8. The output from each of
them looks good.
--
Todd
prev parent reply other threads:[~2019-04-24 2:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 15:15 [PATCH] doc/ls-files: put nested list for "-t" option into block Jeff King
2019-04-23 1:24 ` Junio C Hamano
2019-04-24 2:03 ` Todd Zullinger [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190424020313.GP3654@pobox.com \
--to=tmz@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).