From: Patrick Steinhardt <ps@pks.im>
To: me@black-desk.cn
Cc: git@vger.kernel.org,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v6 2/2] config: add "worktree" and "worktree/i" includeIf conditions
Date: Fri, 3 Jul 2026 13:02:59 +0200 [thread overview]
Message-ID: <akeW4yFC8uuu2o8a@pks.im> (raw)
In-Reply-To: <20260703-includeif-worktree-v6-2-a13893ad9a7f@black-desk.cn>
On Fri, Jul 03, 2026 at 11:13:18AM +0800, Chen Linxuan via B4 Relay wrote:
> diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
> index f3892578e4ff..4e840dfdb35b 100755
> --- a/t/t1305-config-include.sh
> +++ b/t/t1305-config-include.sh
> @@ -396,4 +396,132 @@ test_expect_success 'onbranch without repository but explicit nonexistent Git di
[snip]
> +test_expect_success SYMLINKS 'conditional include, worktree resolves symlinks' '
> + mkdir real-wt &&
> + ln -s real-wt link-wt &&
> + git init link-wt/repo &&
> + (
> + cd link-wt/repo &&
> + # repo->worktree resolves symlinks, so use real path in pattern
> + echo "[includeIf \"worktree:**/real-wt/repo\"]path=bar-link" >>.git/config &&
> + echo "[test]wtlink=2" >.git/bar-link &&
> + echo 2 >expect &&
> + git config test.wtlink >actual &&
> + test_cmp expect actual
> + )
> +'
Okay, this covers one scenario. But with "gitdir:" we're actually able
to use both the symlinked and the real location:
test_expect_success SYMLINKS 'conditional include, worktree matching symlink' '
mkdir sym-real &&
ln -s sym-real sym-link &&
git init sym-link/repo &&
(
cd sym-link/repo &&
link_path="$(pwd)" &&
real_path="$(test-tool path-utils real_path "$link_path")" &&
cat >>.git/config <<-EOF &&
[includeIf "gitdir:$link_path/.git"]
path = gitdir-link
[includeIf "gitdir:$real_path/.git"]
path = gitdir-real
[includeIf "worktree:$link_path"]
path = worktree-link
[includeIf "worktree:$real_path"]
path = worktree-real
EOF
echo "[test]gitdirlink=1" >.git/gitdir-link &&
echo "[test]gitdirreal=1" >.git/gitdir-real &&
echo "[test]worktreelink=1" >.git/worktree-link &&
echo "[test]worktreereal=1" >.git/worktree-real &&
git config get test.gitdirlink &&
git config get test.gitdirreal &&
git config get test.worktreereal &&
test_must_fail git config test.worktreelink
)
'
The last call to git-config(1) fails, which is inconsistent with how
resolve the path for "gitdir".
Other than that I didn't have anything to add, thanks!
Patrick
next prev parent reply other threads:[~2026-07-03 11:03 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-03 3:13 [PATCH v6 0/2] includeIf: add "worktree" condition for matching working tree path Chen Linxuan via B4 Relay
2026-07-03 3:13 ` [PATCH v6 1/2] config: refactor include_by_gitdir() into include_by_path() Chen Linxuan via B4 Relay
2026-07-03 3:13 ` [PATCH v6 2/2] config: add "worktree" and "worktree/i" includeIf conditions Chen Linxuan via B4 Relay
2026-07-03 9:02 ` Junio C Hamano
2026-07-03 11:02 ` Patrick Steinhardt [this message]
2026-07-06 12:18 ` Chen Linxuan
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=akeW4yFC8uuu2o8a@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=me@black-desk.cn \
--cc=phillip.wood@dunelm.org.uk \
/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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox