From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: "Todd Zullinger" <tmz@pobox.com>, "Jeff King" <peff@peff.net>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v2 2/2] doc-diff: replace --cut-header-footer with --cut-footer
Date: Tue, 3 Sep 2019 20:51:21 +0200 [thread overview]
Message-ID: <40f3c4c3a9ce5e9152477b66016831be0b040310.1567534373.git.martin.agren@gmail.com> (raw)
In-Reply-To: <cover.1567534373.git.martin.agren@gmail.com>
After the previous commit, AsciiDoc and Asciidoctor render the manpage
headers identically, so we no longer need the "cut the header" part of
our `--cut-header-footer` option. We do still need the "cut the footer"
part, though. The previous commit improved the rendering of the footer
in Asciidoctor by quite a bit, but the two programs still disagree on
how to format the date in the footer: 01/01/1970 vs 1970-01-01.
We could keep using `--cut-header-footer`, but it would be nice if we
had a slightly smaller hammer `--cut-footer` that would be less likely
to hide regressions. Rather than simply adding such an option, let's
also drop `--cut-header-footer`, i.e., rework it to lose the "header"
part of its name and functionality.
`--cut-header-footer` is just a developer tool and it probably has no
more than a handful of users, so we can afford be aggressive.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
Documentation/doc-diff | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 3355be4798..88a9b20168 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -21,7 +21,7 @@ asciidoc use asciidoc with both commits
to-asciidoc use asciidoc with the 'to'-commit
to-asciidoctor use asciidoctor with the 'to'-commit
asciidoctor use asciidoctor with both commits
-cut-header-footer cut away header and footer
+cut-footer cut away footer
"
SUBDIRECTORY_OK=1
. "$(git --exec-path)/git-sh-setup"
@@ -31,7 +31,7 @@ force=
clean=
from_program=
to_program=
-cut_header_footer=
+cut_footer=
while test $# -gt 0
do
case "$1" in
@@ -55,8 +55,8 @@ do
--asciidoc)
from_program=-asciidoc
to_program=-asciidoc ;;
- --cut-header-footer)
- cut_header_footer=-cut-header-footer ;;
+ --cut-footer)
+ cut_footer=-cut-footer ;;
--)
shift; break ;;
*)
@@ -118,8 +118,8 @@ construct_makemanflags () {
from_makemanflags=$(construct_makemanflags "$from_program") &&
to_makemanflags=$(construct_makemanflags "$to_program") &&
-from_dir=$from_oid$from_program$cut_header_footer &&
-to_dir=$to_oid$to_program$cut_header_footer &&
+from_dir=$from_oid$from_program$cut_footer &&
+to_dir=$to_oid$to_program$cut_footer &&
# generate_render_makefile <srcdir> <dstdir>
generate_render_makefile () {
@@ -169,12 +169,11 @@ render_tree () {
make -j$parallel -f - &&
mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname"
- if test "$cut_header_footer" = "-cut-header-footer"
+ if test "$cut_footer" = "-cut-footer"
then
for f in $(find "$tmp/rendered/$dname" -type f)
do
- tail -n +3 "$f" | head -n -2 |
- sed -e '1{/^$/d}' -e '${/^$/d}' >"$f+" &&
+ head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" &&
mv "$f+" "$f" ||
return 1
done
--
2.23.0
next prev parent reply other threads:[~2019-09-03 18:52 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-17 14:47 [PATCH] asciidoctor-extensions: provide `<refmiscinfo/>` Martin Ågren
2019-03-17 19:44 ` Todd Zullinger
2019-03-17 20:03 ` Martin Ågren
2019-03-19 7:02 ` Martin Ågren
2019-03-20 18:17 ` Todd Zullinger
2019-03-22 21:01 ` Martin Ågren
2019-03-23 19:27 ` Todd Zullinger
2019-03-24 12:16 ` Jeff King
2019-03-24 16:21 ` Todd Zullinger
2019-03-25 15:06 ` Jeff King
2019-03-25 19:00 ` Todd Zullinger
2019-03-27 1:06 ` Todd Zullinger
2019-03-27 10:05 ` SZEDER Gábor
2019-03-28 0:06 ` brian m. carlson
2019-03-30 18:00 ` Todd Zullinger
2019-03-30 21:04 ` brian m. carlson
2019-04-05 2:17 ` Todd Zullinger
2019-04-05 18:46 ` Jeff King
2019-03-28 2:54 ` Jeff King
2019-03-28 3:33 ` Jeff King
2019-03-19 2:46 ` Jeff King
2019-03-19 2:59 ` Jeff King
2019-03-19 3:55 ` Junio C Hamano
2019-03-19 7:33 ` Martin Ågren
2019-03-19 7:36 ` Martin Ågren
2019-09-03 18:51 ` [PATCH v2 0/2] " Martin Ågren
2019-09-03 18:51 ` [PATCH v2 1/2] " Martin Ågren
2019-09-03 18:51 ` Martin Ågren [this message]
2019-09-03 23:16 ` [PATCH v2 0/2] " brian m. carlson
2019-09-05 19:28 ` Martin Ågren
2019-09-04 3:26 ` Jeff King
2019-09-05 19:35 ` Martin Ågren
2019-09-07 6:45 ` Jeff King
2019-09-07 14:06 ` Martin Ågren
2019-09-08 21:30 ` Jeff King
2019-09-06 23:29 ` brian m. carlson
2019-09-07 4:40 ` Jeff King
2019-09-07 16:53 ` brian m. carlson
2019-09-07 17:07 ` [PATCH] Documentation: fix build with Asciidoctor 2 brian m. carlson
2019-09-08 10:48 ` Jeff King
2019-09-08 17:18 ` brian m. carlson
2019-09-08 21:21 ` Jeff King
2019-09-08 22:24 ` brian m. carlson
2019-09-09 17:37 ` Junio C Hamano
2019-09-10 18:44 ` Jeff King
2019-09-11 23:19 ` brian m. carlson
2019-09-08 14:13 ` SZEDER Gábor
2019-09-08 21:32 ` Jeff King
2019-09-13 1:52 ` [PATCH v2] " brian m. carlson
2019-09-13 5:06 ` Jeff King
2019-09-13 17:06 ` Junio C Hamano
2019-09-16 10:47 ` Martin Ågren
2019-09-16 17:43 ` Junio C Hamano
2019-09-14 7:53 ` SZEDER Gábor
2019-09-14 19:44 ` brian m. carlson
2019-09-14 19:49 ` [PATCH v3] " brian m. carlson
2019-09-15 9:59 ` SZEDER Gábor
2019-09-15 21:26 ` brian m. carlson
2019-09-15 22:05 ` SZEDER Gábor
2019-09-15 22:14 ` brian m. carlson
2019-09-16 10:51 ` Martin Ågren
2019-09-15 22:43 ` [PATCH v4] " brian m. carlson
2019-09-16 19:00 ` [PATCH v3 0/3] asciidoctor-extensions: provide `<refmiscinfo/>` Martin Ågren
2019-09-16 19:00 ` [PATCH v3 1/3] Doc/Makefile: give mansource/-version/-manual attributes Martin Ågren
2019-09-16 19:00 ` [PATCH v3 2/3] asciidoctor-extensions: provide `<refmiscinfo/>` Martin Ågren
2019-09-16 19:00 ` [PATCH v3 3/3] doc-diff: replace --cut-header-footer with --cut-footer Martin Ågren
2019-03-19 3:30 ` [PATCH] asciidoctor-extensions: provide `<refmiscinfo/>` Jeff King
2019-03-19 7:12 ` Martin Ågren
2019-03-19 7:43 ` Jeff King
2019-03-20 18:32 ` Todd Zullinger
2019-03-19 7:10 ` Martin Ågren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=40f3c4c3a9ce5e9152477b66016831be0b040310.1567534373.git.martin.agren@gmail.com \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
--cc=szeder.dev@gmail.com \
--cc=tmz@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).