From: shejialuo <shejialuo@gmail.com>
To: Kristoffer Haugsbakk <code@khaugsbakk.name>
Cc: git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>,
Karthik Nayak <karthik.188@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH v2 1/1] fsck: ignore missing "refs" directory for linked worktrees
Date: Mon, 2 Jun 2025 22:11:23 +0800 [thread overview]
Message-ID: <aD2xC0YBDm4TASHG@ArchLinux> (raw)
In-Reply-To: <21461585-273f-46a9-a750-6ae7b414fcdc@app.fastmail.com>
On Mon, Jun 02, 2025 at 03:59:01PM +0200, Kristoffer Haugsbakk wrote:
> > +test_expect_success 'no refs directory of worktree should not cause problems' '
> > + test_when_finished "rm -rf repo" &&
> > + git init repo &&
> > + (
> > + cd repo &&
> > + test_commit initial &&
> > + git worktree add --detach ./worktree &&
> > +
> > + cd worktree &&
>
> Now in this version you change-directory into `worktree`. You would
> need a new subshell for that (test style). But I don’t see the need to
> chdir in the first place?
>
We should change directory into the `worktree`. This is because now in
the test, we use "git rev-parse --git-dir" to get the git directory. We
need to find `gitdir` of the linked worktree but not the `gitdir` of the
main worktree. If we do not cd into the directory, we would get the
`gitdir` of the main worktree.
And I agree with you that we need to spawn a subshell. Let me update the
code. Thanks for reminding me, I forgot about that.
> > + worktree_refdir="$(git rev-parse --git-dir)/refs" &&
> > + # Simulate old directory layout
> > + rmdir "$worktree_refdir" &&
> > + git refs verify 2>err &&
> > + test_must_be_empty err
> > + )
> > +'
> > +
> > test_expect_success 'ref name check should work for multiple worktrees' '
> > test_when_finished "rm -rf repo" &&
> > git init repo &&
> > --
> > 2.49.0
>
> The test passes for me. Also when applying only the test (and not the
> fix) the test fails as expected. Good.
Thanks for the feedback.
Jialuo
next prev parent reply other threads:[~2025-06-02 14:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-30 19:00 [BUG] refs: verify does not work if there are v2.43.0 or older worktrees w/o wt. refs kristofferhaugsbakk
2025-05-30 22:23 ` Eric Sunshine
2025-05-31 1:03 ` shejialuo
2025-05-31 9:52 ` Kristoffer Haugsbakk
2025-05-31 3:39 ` [PATCH] fsck: ignore missing "refs" directory for linked worktrees shejialuo
2025-05-31 12:17 ` Kristoffer Haugsbakk
2025-06-02 1:33 ` Junio C Hamano
2025-06-02 11:30 ` shejialuo
2025-06-02 9:53 ` Phillip Wood
2025-06-02 10:24 ` Patrick Steinhardt
2025-06-02 13:50 ` phillip.wood123
2025-06-02 19:49 ` Junio C Hamano
2025-06-02 12:16 ` shejialuo
2025-06-02 12:41 ` shejialuo
2025-06-02 13:26 ` [PATCH v2 0/1] [BUG] refs: verify does not work if there are v2.43.0 or older worktrees w/o wt. refs shejialuo
2025-06-02 13:29 ` [PATCH v2 1/1] fsck: ignore missing "refs" directory for linked worktrees shejialuo
2025-06-02 13:59 ` Kristoffer Haugsbakk
2025-06-02 14:11 ` shejialuo [this message]
2025-06-02 14:40 ` [PATCH v3 0/1] [BUG] refs: verify does not work if there are v2.43.0 or older worktrees w/o wt. refs shejialuo
2025-06-02 14:41 ` [PATCH v3 1/1] fsck: ignore missing "refs" directory for linked worktrees shejialuo
2025-06-02 15:01 ` [PATCH v3 0/1] [BUG] refs: verify does not work if there are v2.43.0 or older worktrees w/o wt. refs Kristoffer Haugsbakk
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=aD2xC0YBDm4TASHG@ArchLinux \
--to=shejialuo@gmail.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=karthik.188@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=ps@pks.im \
--cc=sunshine@sunshineco.com \
/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;
as well as URLs for NNTP newsgroup(s).