mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
giteveryday: unbreak rendering with AsciiDoctor
The "giteveryday" document has a callout list that contains a code block. This is not a problem for AsciiDoc, but AsciiDoctor sadly was explicitly designed *not* to render this correctly [*1*]. The symptom is an unhelpful line 322: callout list item index: expected 1 got 12 line 325: no callouts refer to list item 1 line 325: callout list item index: expected 2 got 13 line 327: no callouts refer to list item 2 In Git for Windows, we rely on the speed improvement of AsciiDoctor (on this developer's machine, `make -j15 html` takes roughly 30 seconds with AsciiDoctor, 70 seconds with AsciiDoc), therefore we need a way to render this correctly. The easiest way out is to simplify the callout list, as suggested by AsciiDoctor's author, even while one may very well disagree with him that a code block hath no place in a callout list. *1*: https://github.com/asciidoctor/asciidoctor/issues/1478 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e05806da9e
commit
9574901c02
|
@ -307,9 +307,16 @@ master or exposed as a part of a stable branch.
|
||||||
<9> backport a critical fix.
|
<9> backport a critical fix.
|
||||||
<10> create a signed tag.
|
<10> create a signed tag.
|
||||||
<11> make sure master was not accidentally rewound beyond that
|
<11> make sure master was not accidentally rewound beyond that
|
||||||
already pushed out. `ko` shorthand points at the Git maintainer's
|
already pushed out.
|
||||||
|
<12> In the output from `git show-branch`, `master` should have
|
||||||
|
everything `ko/master` has, and `next` should have
|
||||||
|
everything `ko/next` has, etc.
|
||||||
|
<13> push out the bleeding edge, together with new tags that point
|
||||||
|
into the pushed history.
|
||||||
|
|
||||||
|
In this example, the `ko` shorthand points at the Git maintainer's
|
||||||
repository at kernel.org, and looks like this:
|
repository at kernel.org, and looks like this:
|
||||||
+
|
|
||||||
------------
|
------------
|
||||||
(in .git/config)
|
(in .git/config)
|
||||||
[remote "ko"]
|
[remote "ko"]
|
||||||
|
@ -320,12 +327,6 @@ repository at kernel.org, and looks like this:
|
||||||
push = +refs/heads/pu
|
push = +refs/heads/pu
|
||||||
push = refs/heads/maint
|
push = refs/heads/maint
|
||||||
------------
|
------------
|
||||||
+
|
|
||||||
<12> In the output from `git show-branch`, `master` should have
|
|
||||||
everything `ko/master` has, and `next` should have
|
|
||||||
everything `ko/next` has, etc.
|
|
||||||
<13> push out the bleeding edge, together with new tags that point
|
|
||||||
into the pushed history.
|
|
||||||
|
|
||||||
|
|
||||||
Repository Administration[[ADMINISTRATION]]
|
Repository Administration[[ADMINISTRATION]]
|
||||||
|
|
Loading…
Reference in a new issue