broken git-fast-import.xml

broken git-fast-import.xml

[Randal L. Schwartz]

xmlto -m callouts.xsl man git-fast-import.xml
xmlto: input does not validate (status 1)
/Volumes/UFS/MIRROR/git-GIT/Documentation/git-fast-import.xml:527: parser error : Opening and ending tag mismatch: superscript line 527 and literal
<simpara>The <literal><superscript>0</literal> suffix is necessary as gfi does n
                                              ^
/Volumes/UFS/MIRROR/git-GIT/Documentation/git-fast-import.xml:529: parser error : Opening and ending tag mismatch: literal line 529 and superscript
m</literal> command is even read from the input.  Adding <literal></superscript>
                                                                               ^
make[1]: *** [git-fast-import.1] Error 1
rm git-fast-import.xml git-diff-stages.xml


-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!

Re: broken git-fast-import.xml

[Shawn O. Pearce]

"Randal L. Schwartz" <merlyn@stonehenge.com> wrote:
> xmlto -m callouts.xsl man git-fast-import.xml
> xmlto: input does not validate (status 1)
> /Volumes/UFS/MIRROR/git-GIT/Documentation/git-fast-import.xml:527: parser error : Opening and ending tag mismatch: superscript line 527 and literal
> <simpara>The <literal><superscript>0</literal> suffix is necessary as gfi does n
>                                               ^
> /Volumes/UFS/MIRROR/git-GIT/Documentation/git-fast-import.xml:529: parser error : Opening and ending tag mismatch: literal line 529 and superscript
> m</literal> command is even read from the input.  Adding <literal></superscript>
>                                                                                ^
> make[1]: *** [git-fast-import.1] Error 1
> rm git-fast-import.xml git-diff-stages.xml

Thanks. I already knew about the problem and fixed it in 209f1298.
I think Junio planned on pulling this in from my branch on repo.or.cz:

  git://repo.or.cz/git/fastimport

but it hasn't made it to kernel.org yet.  Here's the patch, if you
want to apply it yourself:

--8>--
From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 8 Feb 2007 01:35:37 -0500
Subject: [PATCH] Correct ^0 asciidoc syntax in fast-import docs.

I wrote this documentation with asciidoc 7.1.2, but apparently
asciidoc 8 assumes ^ means superscript.  The solution was already
documented in rev-parse's manpage and is to use {caret} instead.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Documentation/git-fast-import.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 0b64d33..0c44761 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -380,9 +380,9 @@ current branch value should be written as:
 ----
 	from refs/heads/branch^0
 ----
-The `^0` suffix is necessary as gfi does not permit a branch to
+The `{caret}0` suffix is necessary as gfi does not permit a branch to
 start from itself, and the branch is created in memory before the
-`from` command is even read from the input.  Adding `^0` will force
+`from` command is even read from the input.  Adding `{caret}0` will force
 gfi to resolve the commit through Git's revision parsing library,
 rather than its internal branch table, thereby loading in the
 existing value of the branch.
-- 
1.5.0.rc4