git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 0/7] Fix more AsciiDoc/tor differences

From
MÅMartin Ågren <martin.agren@gmail.com>
Date
Sep 7, 2019, 14:12 UTC
Message-ID
<cover.1567707999.git.martin.agren@gmail.com>

This series roughly halves the line count of `./doc-diff --from-asciidoc --to-asciidoctor --cut-header-footer HEAD HEAD`. Together with my recent (independent) mini-series [1], I claim that Asciidoctor 1.5.5 now processes the manpages better than AsciiDoc 8.6.10 does.

Patch 6/7 actually changes the rendering with both engines, so that they look nice and the same. The other patches are all no-ops with one engine while fixing things with the other -- they all improve the situation with Asciidoctor (which is what I care most about) except patch 1/7 which goes the other way (it reduces the doc-diff, which helps).

Patch 7/7 has an element of black magic to it. I wouldn't be too surprised if I've managed to appease my particular versions of these tools while not fixing -- or maybe even breaking? -- some other versions [that people actually use]. That's where I think a quick test would be the most valuable.

I've based this on maint on the assumption that these are bugfixes. (I know I've been bad on basing similar work off of maint.) This causes a conflict with master and pu in config.txt, which has learned about "includeIf onbranch:foo-branch" in the meantime. Maybe I've made the wrong call here -- Junio, if you'd rather have me submit this on master, just let me know.

[1] https://public-inbox.org/git/cover.1567534373.git.martin.agren@gmail.com/
Martin Ågren (7):
  Documentation: wrap blocks with "--"
  git-merge-base.txt: render indentations correctly under Asciidoctor
  Documentation: wrap config listings in "----"
  git-ls-remote.txt: wrap shell listing in "----"
  git-receive-pack.txt: wrap shell [script] listing in "----"
  git-merge-index.txt: wrap shell listing in "----"
  gitweb.conf.txt: switch pluses to backticks to help Asciidoctor
 Documentation/config.txt           | 84 ++++++++++++-------------
 Documentation/git-commit.txt       |  8 ++-
 Documentation/git-config.txt       | 56 +++++++++--------
 Documentation/git-ls-remote.txt    | 32 +++++-----
 Documentation/git-merge-base.txt   | 98 +++++++++++++++++-------------
 Documentation/git-merge-index.txt  | 26 ++++----
 Documentation/git-receive-pack.txt | 52 ++++++++--------
 Documentation/git-send-email.txt   | 12 ++--
 Documentation/git-status.txt       | 18 +++---
 Documentation/gitmodules.txt       | 15 ++---
 Documentation/gitweb.conf.txt      |  6 +-
 11 files changed, 223 insertions(+), 184 deletions(-)
-- 
2.23.0
Next: Martin Ågren
Message 1 of 10 in “Fix more AsciiDoc/tor differences”
  1. 0/7 Fix more AsciiDoc/tor differencesMartin Ågren, Sep 7, 2019
  2. 4/7 git-ls-remote.txt: wrap shell listing in "----"Martin Ågren, Sep 7, 2019
  3. 1/7 Documentation: wrap blocks with "--"Martin Ågren, Sep 7, 2019
  4. 3/7 Documentation: wrap config listings in "----"Martin Ågren, Sep 7, 2019
  5. 2/7 git-merge-base.txt: render indentations correctly under AsciidoctorMartin Ågren, Sep 7, 2019
  6. 5/7 git-receive-pack.txt: wrap shell [script] listing in "----"Martin Ågren, Sep 7, 2019
  7. 7/7 gitweb.conf.txt: switch pluses to backticks to help AsciidoctorMartin Ågren, Sep 7, 2019
  8. 6/7 git-merge-index.txt: wrap shell listing in "----"Martin Ågren, Sep 7, 2019
  9. Jeff KingSep 13, 2019
  10. Martin ÅgrenSep 13, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.