From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "Martin Ågren" <martin.agren@gmail.com>,
"brian m . carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp
Date: Mon, 24 May 2021 14:23:50 -0500 [thread overview]
Message-ID: <60abfd46a8ca3_1b20920823@natae.notmuch> (raw)
In-Reply-To: <xmqq1r9wj9im.fsf@gitster.g>
Junio C Hamano wrote:
> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
> > This patch series gets rid of old unnecessary workarounds and convoluted solutions.
> >
> > Additionally it cleanups the asciidoctor-specific code so it ends up much more simpler.
> >
> > This goes on top of my other cleanup patches [1].
> >
> > Since v2 there's only one small fix that introduced an extra space after linkgit.
>
> Since v1, I presume?
Yes.
> It seems that the previous round did not interest anybody (or am I
> looking at the archive incorrectly???)
None the cared to reply, correct.
> In any case, after applying the 5-patch series on 2.32-rc1, an
> attempt ot apply these 12 patches seems to fail at the very first
> step.
>
> $ git am -s ./+fc12-doc-build-cleanup-more
> error: removal patch leaves file contents
> error: Documentation/manpage-quote-apos.xsl: patch does not apply
> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> Applying: doc: remove GNU troff workaround
> Patch failed at 0001 doc: remove GNU troff workaround
Apparently my scripts call `git format-patch` with -D, which doesn't
generate appliable patches when files are deleted.
If you remove the files manually the series applies cleanly.
Do you want me to send it again without -D?
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2021-05-24 19:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 22:36 [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 01/12] doc: remove GNU troff workaround Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 02/12] doc: use --stringparam in xmlto Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 03/12] doc: simplify version passing Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 04/12] doc: asciidoc: remove unnecessary attribute Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 05/12] doc: asciidoctor: remove unnecessary require Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 06/12] doc: asciidoctor: remove cruft Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 07/12] doc: asciidoctor: reorganize extensions Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 08/12] doc: asciidoctor: use html-prefix only for html Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 09/12] doc: asciidoctor: refactor macro registration Felipe Contreras
2021-05-21 22:36 ` [PATCH v2 10/12] doc: asciidoctor: improve string handling Felipe Contreras
2021-05-21 22:37 ` [PATCH v2 11/12] doc: asciidoctor: split the format from the code Felipe Contreras
2021-05-21 22:37 ` [PATCH v2 12/12] doc: asciidoctor: specify name of our group Felipe Contreras
2021-05-24 18:01 ` [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp Junio C Hamano
2021-05-24 19:23 ` Felipe Contreras [this message]
2021-05-25 6:59 ` Junio C Hamano
2021-05-25 7:14 ` Junio C Hamano
2021-05-25 10:44 ` 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
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=60abfd46a8ca3_1b20920823@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=sandals@crustytoothpaste.net \
/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).