From nobody Sun Apr 19 23:05:49 2026 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fzPPK4Vrmz6ZgsM for ; Sun, 19 Apr 2026 23:06:13 +0000 (UTC) (envelope-from dch@skunkwerks.at) Received: from fout-b7-smtp.messagingengine.com (fout-b7-smtp.messagingengine.com [202.12.124.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4fzPPK29R6z4Qj5 for ; Sun, 19 Apr 2026 23:06:13 +0000 (UTC) (envelope-from dch@skunkwerks.at) Authentication-Results: mx1.freebsd.org; none Received: from phl-compute-06.internal (phl-compute-06.internal [10.202.2.46]) by mailfout.stl.internal (Postfix) with ESMTP id E4B251D0014E; Sun, 19 Apr 2026 19:06:11 -0400 (EDT) Received: from phl-imap-16 ([10.202.2.88]) by phl-compute-06.internal (MEProxy); Sun, 19 Apr 2026 19:06:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=skunkwerks.at; h=cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1776639971; x=1776726371; bh=3je6rS05isuddhIQashnliKDJ1gLOPWKcYbzadb86Vc=; b= Unu9ZkOpWcgf5NdmLghTQOCspd8FWW+NK2Oi4sLbyQpPlZbQqgFCkHJQzIBkVWvN C1tOU7iXHse4rwkpwiOS8TpY+DeorG0q2ZhSFmqF4IzVgDS7Ey+zZGDRHca+Vwst vB9Xe8bn4A1ro8vclhqflq70x0+yG3AeLAKMI6vAM/0scansApdHQ/vgpf+KE6kI BBJxZRb1y3JsbJ/WEmBbTUhJr8r+P3rJrI5V4qsl5KlDipI9tSrcNKb4cYXeMP/Q pTZZnBt3bY/uV4lTXpWARg3r4J8ox7yHDgcgB/zEn9dfLTBqtYiyAouYqHx6sFo9 /doFe6R7ufS0xnWsNlZvhw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; t=1776639971; x=1776726371; bh=3 je6rS05isuddhIQashnliKDJ1gLOPWKcYbzadb86Vc=; b=eHoIbMzmt+NuXIN22 j76buP0c2FTVXKCcOoga0R/ReOn7DbpbwyS0w9UrHA8AketktbevuiaQc+X6mbcF 0/qtZdLN0s25aKmYPRSDPGLcT5+voPon0i1qFVegDKVGcsOWt6hCIt23CNNz35L4 O7blkWUdqVhY3v+zKHviLq3XFzlxJvZL5w5Hq0YEbkCv4yUxX7OIsKMg62rjpIki l56MaC3NX3OhuNqWor1wm5fSIrQCrkz++dWRIPl+mtH+jVkkE0Nqw3gIGWY/hXQn KHZDN8NO4HnB5kJAldXBR9hTo45+YV21R5J2bGyuiDpnLjp15Yon4gffeO/mjuXr mGMUw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefhedrtddtgdehieelvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpuffrtefokffrpgfnqfghnecuuegr ihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjug hrpefoggffhffvkfgjfhfutgfgsehtjeertdertddtnecuhfhrohhmpedfffgrvhgvucev ohhtthhlvghhuhgsvghrfdcuoegutghhsehskhhunhhkfigvrhhkshdrrghtqeenucggtf frrghtthgvrhhnpeeiveehjeefudfgjeeljeelkedtieelueektdevfeeiteeutdeljeeh feegheefhfenucffohhmrghinhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegutghhsehskhhunhhkfigvrhhk shdrrghtpdhnsggprhgtphhtthhopedvpdhmohguvgepshhmthhpohhuthdprhgtphhtth hopehkrghrlhesuggvnhhnihhnghgvrhdrnhgvthdprhgtphhtthhopehfrhgvvggsshgu qdhgihhtsehfrhgvvggsshgurdhorhhg X-ME-Proxy: Feedback-ID: ic0e84090:Fastmail Received: by mailuser.phl.internal (Postfix, from userid 501) id 08E102CC0083; Sun, 19 Apr 2026 19:06:11 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@FreeBSD.org MIME-Version: 1.0 X-ThreadId: AGsS1XNk6o3- Date: Sun, 19 Apr 2026 23:05:49 +0000 From: "Dave Cottlehuber" To: "Karl Denninger" , freebsd-git Message-Id: <2553b702-7ebe-4808-a4ba-515f14e239f0@app.fastmail.com> In-Reply-To: <895a13c7-4274-4ffb-a882-2e71c1b99e2d@denninger.net> References: <895a13c7-4274-4ffb-a882-2e71c1b99e2d@denninger.net> Subject: Re: Worktree problem setting up for 15/stable Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:151847, ipnet:202.12.124.0/24, country:AU] X-Rspamd-Queue-Id: 4fzPPK29R6z4Qj5 X-Spamd-Bar: ---- 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