From: Junio C Hamano Date: Sat, 05 May 2007 08:10:47 GMT Subject: Re: [PATCH] Makefile: use --unsafe option under Cygwin with asciidoc Message-ID: <7v7irnlmgo.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <7vslaf4121.fsf@assigned-by-dhcp.cox.net> Junio C Hamano writes: > Eric Blake writes: > >> According to Jari Aalto on 5/2/2007 5:49 AM: >>> New: variable ASCIIDOC_FLAGS was introduced. It was also added to two >>> new targets. The old ASCIIDOC_EXTRA is set to --unsafe under Cygwin to >>> ignore asciidoc error about unsafe include. >> >> This isn't just for cygwin, since it benefits any platform where the >> installed asciidoc is 8.1 or better (asciidoc is currently at 8.2.1 if you >> build the from tarballs). I got curious and tried this myself. > What unsafe things do we include? Maybe _that_ is what should > be fixed? I couldn't trigger "unsafe" error. > Also the last time we checked (I cannot take credits for this > work -- see "git show origin/todo:TODO" and look for > "AsciiDoc"), AsciiDoc 8 had backward compatibility problems, and > you needed to add some pragma in asciidoc.conf to make it > compatible with sources written for AsciiDoc 7 (i.e. our > documentation). Here are randomly selected differences between the documentation pages formatted with AsciiDoc 7 and 8. --- 7 2007-05-05 01:06:39.000000000 -0700 +++ 8 2007-05-05 01:06:36.000000000 -0700 @@ -1,33 +1,33 @@ git\-bundle will only package references that are shown by git\-show\-ref: -this includes heads, tags, and remote heads. References such as master~1 +this includes heads, tags, and remote heads. References such as master1 cannot be packaged, but are perfectly suitable for defining the basis. More than one reference may be packaged, and more than one basis can be specified. The objects packaged are those not contained in the union of -the given bases. Each basis can be specified explicitly (e.g., ^master~10), +the given bases. Each basis can be specified explicitly (e.g., ^master10), or implicitly (e.g., master~10..master, master \-\-since=10.days.ago). Notice broken tilde. -After this three\-way merge, the local modifications are _not_ +After this three\-way merge, the local modifications are \fInot\fR registered in your index file, so git diff would show you what changes you made since the tip of the new branch. -

which will simply _create_ the branch, but will not do anything further. +

which will simply create the branch, but will not do anything further. AsciiDoc 8 knows _emphasis_ which is nice. -Allow ~user notation to be used in requests. When specified with no -parameter, requests to git://host/~alice/foo is taken as a request to +Allow user notation to be used in requests. When specified with no +parameter, requests to git://host/alice/foo is taken as a request to access \fIfoo\fR repository in the home directory of user alice. If \-\-user\-path=path is specified, the same request is taken as a request to access path/foo repository in the home directory of user alice. Again, broken tilde. In the above example output, the function signature was changed from -both files (hence two \- removals from both file1 and file2, plus ++ -to mean one line that was added does not appear in either file1 nor +both files (hence two \- removals from both file1 and file2, plus + to +mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same from file1 but do not appear -in file2 (hence prefixed with +). +in file2 (hence prefixed with ). Missing plus (in manpage output).

In the above example output, the function signature was changed from both files (hence two - removals from both file1 and -file2, plus ++ to mean one line that was added does not appear +file2, plus + to mean one line that was added does not appear in either file1 nor file2). Also two other lines are the same -from file1 but do not appear in file2 (hence prefixed with +).

+from file1 but do not appear in file2 (hence prefixed with ).

When shown by git diff-tree -c, it compares the parents of a Same (in HTML output). I haven't dug into the list archive article I quoted yet (the pointer is also found in TODO file in 'todo' branch) and haven't tried the backward compatibility pragma, but you can clearly see that the above differences are simply unacceptable. They are not insignificant cosmetic differences -- the most important techinical details are being mangled, rendering the documentation useless. We _do_ need the backward compatiblity enabled in asciidoc.conf or somewhere.