Re: [PATCH v2 00/12] doc: cleanup old cruft and asciidoctor revamp

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 24, 2021, 19:23 UTC
Message-ID: <60abfd46a8ca3_1b20920823@natae.notmuch>
In-Reply-To: <xmqq1r9wj9im.fsf@gitster.g>

Junio C Hamano wrote:

Show 11 quoted lines

> 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.

Show 10 quoted lines

> 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