git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v4 0/2] includeIf: add "worktree" condition for matching working tree path

From
Junio C Hamano <gitster@pobox.com>
Date
May 25, 2026, 03:01 UTC
Message-ID
<xmqqwlwsfazz.fsf@gitster.g>
In-Reply-To
<CAC1kPDNKfm9Q=FWJkvpUSBmpmxL+RaOCifST8p=ViDwqVceNsg@mail.gmail.com>
Chen Linxuan <me@black-desk.cn> writes:
Show 32 quoted lines
> On Mon, May 25, 2026 at 10:14 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Chen Linxuan via B4 Relay <devnull+me.black-desk.cn@kernel.org>
>> writes:
>>
>> > The `includeIf` mechanism already supports matching on the `.git`
>> > directory path (`gitdir`) and the currently checked out branch
>> > (`onbranch`).  But in multi-worktree setups the `.git` directory of a
>> > linked worktree points into the main repository's `.git/worktrees/`
>> > area, which makes `gitdir` patterns cumbersome when one wants to
>> > include config based on the working tree's checkout path instead.
>> >
>> > Introduce two new condition keywords:
>> >
>> >   - `worktree:<pattern>` matches the realpath of the current worktree's
>> >     working directory against a glob pattern.
>> >   - `worktree/i:<pattern>` is the case-insensitive variant.
>> >
>> > Supported pattern features: glob wildcards, `**/` and `/**`, `~`
>> > expansion, `./` relative paths, and trailing-`/` prefix matching.
>> > The condition never matches in a bare repository.
>> >
>> > Signed-off-by: Chen Linxuan <me@black-desk.cn>
>> > ---
>>
>> The test in this series fails in GitHub CI for Windows, it seems.
>>
>> https://github.com/git/git/actions/runs/26377220573/job/77639885088
>
> It seems that "includeIf.worktree:/.path" not working on windows.
>
> Will be updated in V5

The topic has long been merged to 'next', but I've reverted the topic out of 'next', so I can take a new iteration.

Thanks.
Previous: Chen Linxuan
Message 8 of 8 in “includeIf: add "worktree" condition for matching working tree path”
  1. 0/2 includeIf: add "worktree" condition for matching working tree pathChen Linxuan via B4 Relay, May 13, 2026
  2. 2/2 config: add "worktree" and "worktree/i" includeIf conditionsChen Linxuan via B4 Relay, May 13, 2026
  3. Phillip WoodMay 13, 2026
  4. Patrick SteinhardtMay 21, 2026
  5. 1/2 config: refactor include_by_gitdir() into include_by_path()Chen Linxuan via B4 Relay, May 13, 2026
  6. Junio C HamanoMay 25, 2026
  7. Chen LinxuanMay 25, 2026
  8. Junio C HamanoMay 25, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.