Skip to contentSkip to conversation

broken git-fast-import.xml

DISCUSSION Randal L. Schwartz 2 participants 2 messages Jun 15, 2016 Documentation

lore
Share & tools
lore
#0 lore raw

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

Signature · 4 lines
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<[email protected]> <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!
#1 lore raw
Quoted 10 lines · 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

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 <[email protected]>
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.

---
 Documentation/git-fast-import.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Documentation/git-fast-import.txt +2 -2
index 0b64d33..0c44761 100644
@@ -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.
Signature · 1 line
1.5.0.rc4