From: "Martin Ågren" <martin.agren@gmail.com> To: Felipe Contreras <felipe.contreras@gmail.com> Cc: git@vger.kernel.org, "brian m . carlson" <sandals@crustytoothpaste.net>, "Jeff King" <peff@peff.net>, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com> Subject: Re: [PATCH 03/11] doc: doc-diff: set docdate manually Date: Fri, 14 May 2021 17:43:16 +0200 [thread overview] Message-ID: <20210514154316.810-1-martin.agren@gmail.com> (raw) In-Reply-To: <20210514121435.504423-4-felipe.contreras@gmail.com> On Fri, 14 May 2021 at 14:14, Felipe Contreras <felipe.contreras@gmail.com> wrote: > > Asciidoc automatically generates a date with format '%Y-%m-%d', while > asciidoctor '%F'. Is that really the format Asciidoc uses? Not that it matters much for the purposes of this patch. > I personally prefer the latter, so only modify it for diff purposes. I agree completely. > Fixes tons of these: > > -Git omitted 01/01/1970 GIT-ADD(1) > +Git omitted 1970-01-01 GIT-ADD(1) > then > - echo USE_ASCIIDOCTOR=YesPlease > + echo USE_ASCIIDOCTOR=YesPlease ASCIIDOC_EXTRA='-adocdate="01/01/1970"' > fi Nice. If you introduce a separate Makefile flag and incorporate Peff's patch to doc-diff "asciidoctor" and "asciidoctor-direct", you'd need to duplicate this a bit, or maybe just emit the ASCIIDOC_EXTRA outside of the whole if chain. You could follow up with the patch below. If you'd rather keep it out of your series to avoid it ballooning, fine. I can repost it later, once the dust has settled. Don't let it hold up your work. -- >8 -- Subject: [PATCH] doc-diff: drop --cut-footer switch Now that our doc-diff convinces Asciidoctor to insert the exact same formatted dummy date as AsciiDoc, we can drop the --cut-footer switch. It has been useful to ignore this difference between the two tools, but it's effectively a no-op now. Similar to when we repurposed this from --cut-header-footer in 83b0b8953e ("doc-diff: replace --cut-header-footer with --cut-footer", 2019-09-16), just drop it without worrying about any kind of backwards compatibility or user-base. Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Documentation/doc-diff | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/Documentation/doc-diff b/Documentation/doc-diff index aae5fc1933..97671ca65d 100755 --- a/Documentation/doc-diff +++ b/Documentation/doc-diff @@ -21,7 +21,6 @@ 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-footer cut away footer " SUBDIRECTORY_OK=1 . "$(git --exec-path)/git-sh-setup" @@ -31,7 +30,6 @@ force= clean= from_program= to_program= -cut_footer= while test $# -gt 0 do case "$1" in @@ -55,8 +53,6 @@ do --asciidoc) from_program=-asciidoc to_program=-asciidoc ;; - --cut-footer) - cut_footer=-cut-footer ;; --) shift; break ;; *) @@ -118,8 +114,8 @@ construct_makemanflags () { from_makemanflags=$(construct_makemanflags "$from_program") && to_makemanflags=$(construct_makemanflags "$to_program") && -from_dir=$from_oid$from_program$cut_footer && -to_dir=$to_oid$to_program$cut_footer && +from_dir=$from_oid$from_program && +to_dir=$to_oid$to_program && # generate_render_makefile <srcdir> <dstdir> generate_render_makefile () { @@ -168,16 +164,6 @@ render_tree () { "$tmp/rendered/$dname+" | make -j$parallel -f - && mv "$tmp/rendered/$dname+" "$tmp/rendered/$dname" - - if test "$cut_footer" = "-cut-footer" - then - for f in $(find "$tmp/rendered/$dname" -type f) - do - head -n -2 "$f" | sed -e '${/^$/d}' >"$f+" && - mv "$f+" "$f" || - return 1 - done - fi fi } -- 2.31.1.751.gd2f1c929bd
next prev parent reply other threads:[~2021-05-14 15:43 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-05-14 12:14 [PATCH 00/11] doc: asciidoctor: direct man page creation and fixes Felipe Contreras 2021-05-14 12:14 ` [PATCH 01/11] doc: allow the user to provide ASCIIDOC_EXTRA Felipe Contreras 2021-05-15 9:32 ` Jeff King 2021-05-15 9:39 ` Jeff King 2021-05-15 12:13 ` Felipe Contreras 2021-05-17 8:57 ` Jeff King 2021-05-17 10:53 ` Felipe Contreras 2021-05-17 11:39 ` Jeff King 2021-05-17 16:50 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 02/11] doc: doc-diff: allow more than one flag Felipe Contreras 2021-05-15 9:37 ` Jeff King 2021-05-15 12:11 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 03/11] doc: doc-diff: set docdate manually Felipe Contreras 2021-05-14 15:43 ` Martin Ågren [this message] 2021-05-14 20:33 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 04/11] doc: use asciidoctor to build man pages directly Felipe Contreras 2021-05-14 15:38 ` Martin Ågren 2021-05-14 20:26 ` Felipe Contreras 2021-05-14 12:14 ` [PATCH 05/11] doc: asciidoctor: add linkgit macros in man pages Felipe Contreras 2021-05-14 12:14 ` [PATCH 06/11] doc: join mansource and manversion Felipe Contreras 2021-05-14 12:14 ` [PATCH 07/11] doc: add man pages workaround for asciidoctor Felipe Contreras 2021-05-14 12:14 ` [PATCH 08/11] doc: asciidoctor: add hack for xrefs Felipe Contreras 2021-05-14 12:14 ` [PATCH 09/11] doc: asciidoctor: add hack to improve links Felipe Contreras 2021-05-14 12:14 ` [PATCH 10/11] doc: asciidoctor: add support for baseurl Felipe Contreras 2021-05-14 12:14 ` [PATCH 11/11] doc: asciidoctor: cleanup man page hack Felipe Contreras
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 * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210514154316.810-1-martin.agren@gmail.com \ --to=martin.agren@gmail.com \ --cc=avarab@gmail.com \ --cc=felipe.contreras@gmail.com \ --cc=git@vger.kernel.org \ --cc=peff@peff.net \ --cc=sandals@crustytoothpaste.net \ --subject='Re: [PATCH 03/11] doc: doc-diff: set docdate manually' \ /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
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 NNTP newsgroup(s).