# broken git-fast-import.xml 2 messages from 2007-02-08 to 2007-02-08. Participants: Randal L. Schwartz, Shawn O. Pearce. Thread: https://gitlist.dev/t/6743 ## Randal L. Schwartz, 2007-02-08 23:09 Subject: broken git-fast-import.xml Message-ID: <864ppwtffu.fsf@blue.stonehenge.com> URL: https://gitlist.dev/e/864ppwtffu.fsf%40blue.stonehenge.com ``` 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 The 0 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 command is even read from the input. Adding ^ 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 Perl/Unix/security consulting, Technical writing, Comedy, etc. etc. See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training! ``` ## Shawn O. Pearce, 2007-02-08 23:13 Subject: Re: broken git-fast-import.xml Message-ID: <20070208231341.GB1382@spearce.org> URL: https://gitlist.dev/e/20070208231341.GB1382%40spearce.org In-Reply-To: <864ppwtffu.fsf@blue.stonehenge.com> ``` "Randal L. Schwartz" 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 > The 0 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 command is even read from the input. Adding > ^ > 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 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 --- 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 ```