Re: What's cooking in git.git (Jan 2025, #07; Fri, 24)

From: Jeff King <peff@peff.net>
Date: Jan 28, 2025, 16:46 UTC
Message-ID: <20250128164606.GA1688180@coredump.intra.peff.net>
In-Reply-To: <xmqqwmekvubv.fsf@gitster.g>

On Fri, Jan 24, 2025 at 12:19:00PM -0800, Junio C Hamano wrote:

Show 14 quoted lines

> * bc/doc-adoc-not-txt (2025-01-21) 5 commits
>   (merged to 'next' on 2025-01-24 at 737049d332)
>  + Remove obsolete ".txt" extensions for AsciiDoc files
>  + doc: use .adoc extension for AsciiDoc files
>  + gitattributes: mark AsciiDoc files as LF-only
>  + editorconfig: add .adoc extension
>  + doc: update gitignore for .adoc extension
> 
>  All the documentation .txt files have been renamed to .adoc to help
>  content aware editors.
> 
>  Will cook in 'next' for at least 3 weeks til mid Feb 2025.
>  cf. <xmqqmsfl2gro.fsf@gitster.g>
>  source: <20250120015603.1980991-1-sandals@crustytoothpaste.net>

I noticed CI complaining about a missing include file:

  2025-01-28T15:51:45.3979314Z asciidoc: WARNING: difftool.adoc: line 16: include file not found: /home/runner/work/git/git/Documentation/mergetools-diff.txt

The problem is that the line was introduced by another concurrent branch, aj/difftool-config-doc-fix. So we can't fix it independently on either branch; the line does not exist yet in brian's adoc branch, and the file is still ".txt" in Adam's doc-fix branch.

It has to be fixed in an evil merge of the two (or brian's rebased on Adam's, which has since graduated to master).

-Peff