Re: Worktree problem setting up for 15/stable

On 4/19/2026 19:05, Dave Cottlehuber wrote:
> On Sun, 19 Apr 2026, at 16:24, Karl Denninger wrote:
>> Since 15.1 is approaching I now wish to add a 15/stable work tree to my
>> locally checked out base repo.
>>
>> I currently have this, having pruned back the revisions I no longer use:
>>
>> /usr/git/src          60bac4d6438b [main]
>> /usr/src.14-STABLE    d1160074500d [stable/14]
>> /usr/src.14.1-RELEASE 0892dff10444 [releng/14.1]
> Hi Karl
>
> Have you perhaps modified your /usr/git/src/.git/config ?
>
> This is what I have (my upstream is freebsd)
>
> [remote "upstream"]
>      tagopt = --no-tags
>      url =https://git.freebsd.org/src.git
>      pushurl =git@gitrepo.freebsd.org:src.git
>      fetch = +refs/notes/*:refs/notes/*
>      fetch = +refs/heads/main:refs/remotes/upstream/main
>      fetch = +refs/heads/releng/14.4:refs/remotes/upstream/releng/14.4
>      fetch = +refs/heads/releng/15.0:refs/remotes/upstream/releng/15.0
>      fetch = +refs/heads/stable/14:refs/remotes/upstream/stable/14
>      fetch = +refs/heads/stable/15:refs/remotes/upstream/stable/15
>
> Maybe you need this last line.
>
> A+
> Dave

No manual changes.

I found the problem -- I tried to delete (after removing the worktree) 
the stable/15 branch and it complained that there were unmerged changes 
(which shouldn't be possible since I just checked it out.)

A force-delete cleared it and a subsequent add of the worktree was 
successful.

Not sure how that happened but it was probably my fat-finger that did it :-)

-- 
Karl Denninger
karl@denninger.net
/The Market Ticker/
/[S/MIME encrypted email preferred]/