Re: [PATCH] Fix break in git-rev-list.txt

From: Quy Tonthat <qtonthat@gmail.com>
Date: Aug 22, 2007, 14:37 UTC
Message-ID: <46CC4A43.9050305@gmail.com>
In-Reply-To: <7vbqczkhvb.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote:

Show 34 quoted lines

> 
> Hmph.  Interesting.  The text around this is:
> 
> 	-g, --wark-reflogs::
> 
>         	Indented first paragraph...
> 	+
>         With '\--pretty' fromat ... second paragraph ...
> 	prefixed with this information on the same line.
> 	+
>         Cannot be combined with --reverse.
> 
> And its formatted form looks like either (without your patch):
> 
> 	<listitem>
>         <simpara>
>         	Indented first paragraph...
> 	With <emphasis>--pretty</emphasis> format ...
> 	</simpara>
>         <simpara>Cannot be combined with --reverse.</simpara>
> 
>         </listitem>	
> 
> or (with):
> 
> 	<listitem>
>         <simpara>
>         	Indented first paragraph...
> 	With <emphasis>--pretty</emphasis> format ...
> 	Cannot be combined with --reverse.
> 	</simpara>
> 
>         </listitem>	
>

Well, it goes differently on my system here (asciidoc 8.1.0), as shown in the diff bellow:

	--- git-rev-list.xml.bad	2007-08-23 00:08:58.000000000 +1000
	+++ git-rev-list.xml.good	2007-08-23 00:10:20.000000000 +1000
	@@ -509,16 +509,15 @@
	         When this option is used you cannot specify commits to
	         exclude (that is, <emphasis>&#94;commit</emphasis>, <emphasis>commit1..commit2</emphasis>,
	         nor <emphasis>commit1&#8230;commit2</emphasis> notations cannot be used).
	-<literal>
	 With <emphasis>--pretty</emphasis> format other than oneline (for obvious reasons),
	 this causes the output to have two extra lines of information

	 taken from the reflog.  By default, <emphasis>commit@{Nth}</emphasis> notation is
	 used in the output.  When the starting commit is specified as

	 instead.  Under <emphasis>--pretty=oneline</emphasis>, the commit message is

	 prefixed with this information on the same line.

	-</literal>

	-Cannot be combined with --reverse.

	 </simpara>

	+<simpara>Cannot be combined with --reverse.</simpara>

	 </listitem>

	 </varlistentry>

	 <varlistentry>

Note the extra <literal></literal> which what xmlto has problems with as in its error messages

/work/devel/git/git.git/Documentation/git-rev-list.xml:512: element literal: validity error : Element emphasis is not declared in literal list of possible children

I'll have a look at asciidoc as soon as I have some time.

Quy