From: Taylor Blau <me@ttaylorr.com>
To: Caleb White <cdwhite3@pm.me>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Phillip Wood <phillip.wood123@gmail.com>,
shejialuo <shejialuo@gmail.com>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Subject: Re: [PATCH 1/2] worktree: add CLI/config options for relative path linking
Date: Mon, 28 Oct 2024 12:54:53 -0400 [thread overview]
Message-ID: <Zx/B3caIgAeAv6Kz@nand.local> (raw)
In-Reply-To: <D57L2P544W08.2MHA3Q38UBPEO@pm.me>
On Mon, Oct 28, 2024 at 04:35:22PM +0000, Caleb White wrote:
> On Sun Oct 27, 2024 at 7:34 PM CDT, Taylor Blau wrote:
> > Additionally, it appears that this patch breaks at least t0001-init.sh,
> > but others as well. The relevant portion of -vx from t0001.46 is:
> >
> > --- 8< ---
> > + git -C mainwt config worktree.useRelativePaths true
> > + git -C mainwt worktree add --detach ../linkwt
> > Preparing worktree (detached HEAD 89e2b84)
> > HEAD is now at 89e2b84 gumby
> > + git -C mainwt init --separate-git-dir ../seprepo
> > Reinitialized existing Git repository in /home/ttaylorr/src/git/t/trash directory.t0001-init/seprepo/
> > + git -C mainwt rev-parse --git-common-dir
> > fatal: repo version is 0, but v1-only extension found:
> > relativeworktrees
> > --- >8 ---
> >
> > Let's please fix this breakage, and then decide what we are going to do
> > with the extension in the second patch relatively soon, as I worry that
> > putting the original topic on master may have been a mistake if it is
> > going to break worktree pruning on earlier Git versions.
>
> Thanks for catching this, the issue is that there's a bug in the
> `initialize_repository_version()` function when reinitializing a
> repository---the function doesn't check if there are other extensions
> in use before downgrading the repository version to 0.
>
> This is a rare edge case, but I'll work on a fix.
I am confused... are you saying t0001.46 is flaky? I don't think that
it is, as it fails consistently for me with your patches applied when
ran in a loop.
I am definitely guilty of having sent broken patches to the list before
that fail CI, usually when I have amended something I thought was
trivial after already running the test suite on all patches, only to
realize that it wasn't trivial after all and instead broken something.
But please do be careful to thoroughly vet your patches before sending
them to the list, as this sort of breakage can be disruptive.
Thanks,
Taylor
next prev parent reply other threads:[~2024-10-28 16:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-25 22:29 [PATCH 0/2] Allow relative worktree linking to be configured by the user Caleb White
2024-10-25 22:29 ` [PATCH 1/2] worktree: add CLI/config options for relative path linking Caleb White
2024-10-28 0:17 ` Taylor Blau
2024-10-28 0:34 ` Taylor Blau
2024-10-28 16:35 ` Caleb White
2024-10-28 16:54 ` Taylor Blau [this message]
2024-10-28 18:50 ` Caleb White
2024-10-28 1:16 ` Caleb White
2024-10-25 22:29 ` [PATCH 2/2] worktree: add `relativeWorktrees` extension Caleb White
2024-10-28 0:20 ` Taylor Blau
2024-10-28 1:14 ` Caleb White
2024-10-28 17:08 ` Taylor Blau
2024-10-28 19:00 ` Caleb White
2024-10-28 23:36 ` Taylor Blau
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=Zx/B3caIgAeAv6Kz@nand.local \
--to=me@ttaylorr.com \
--cc=cdwhite3@pm.me \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=phillip.wood123@gmail.com \
--cc=shejialuo@gmail.com \
--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).