From nobody Sun Apr 19 16:24:29 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 4fzDVQ55dqz6WkSR for ; Sun, 19 Apr 2026 16:25:02 +0000 (UTC) (envelope-from karl@denninger.net) Received: from colo1.denninger.net (colo1.denninger.net [104.236.120.189]) (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 4fzDVP3HWkz3M09 for ; Sun, 19 Apr 2026 16:25:01 +0000 (UTC) (envelope-from karl@denninger.net) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=denninger.net; spf=pass (mx1.freebsd.org: domain of karl@denninger.net designates 104.236.120.189 as permitted sender) smtp.mailfrom=karl@denninger.net Received: from denninger.net (unknown [162.81.137.111]) (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) (No client certificate requested) by colo1.denninger.net (Postfix) with ESMTPS id C7D1A4E602 for ; Sun, 19 Apr 2026 12:24:10 -0400 (EDT) Received: by denninger.net (Postfix, from userid 58) id 8EFF53F32; Sun, 19 Apr 2026 12:24:30 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 4.0.2 (2025-08-27) on NewFS.denninger.net X-Spam-Level: X-Spam-Status: No, score=-4.9 required=3.0 tests=ALL_TRUSTED,BAYES_00, HTML_FONT_SIZE_HUGE,HTML_MESSAGE autolearn=no autolearn_force=no version=4.0.2 X-Spam-Report: * -3.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 HTML_FONT_SIZE_HUGE BODY: HTML font size is huge * 0.0 HTML_MESSAGE BODY: HTML included in message Received: from [192.168.10.16] (D6.Denninger.Net [192.168.10.16]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by denninger.net (Postfix) with ESMTPSA id C2C7B3BF5 for ; Sun, 19 Apr 2026 12:24:29 -0400 (EDT) Message-ID: <895a13c7-4274-4ffb-a882-2e71c1b99e2d@denninger.net> Date: Sun, 19 Apr 2026 12:24:29 -0400 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 User-Agent: Mozilla Thunderbird Content-Language: en-US To: freebsd-git@freebsd.org From: Karl Denninger Subject: Worktree problem setting up for 15/stable Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha-512; boundary="------------ms080609060409070906000007" X-Spamd-Result: default: False [-2.84 / 15.00]; SIGNED_SMIME(-2.00)[]; NEURAL_SPAM_LONG(1.00)[1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.996]; DMARC_POLICY_ALLOW(-0.50)[denninger.net,none]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.20)[multipart/signed,multipart/alternative,text/plain]; MIME_BASE64_TEXT(0.10)[]; NEURAL_HAM_SHORT(-0.04)[-0.042]; RCPT_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:14061, ipnet:104.236.64.0/18, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:~,4:~]; FREEFALL_USER(0.00)[karl]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; R_DKIM_NA(0.00)[]; TO_DN_NONE(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; MLMMJ_DEST(0.00)[freebsd-git@freebsd.org]; HAS_ATTACHMENT(0.00)[] X-Rspamd-Queue-Id: 4fzDVP3HWkz3M09 X-Spamd-Bar: -- This is a cryptographically signed message in MIME format. --------------ms080609060409070906000007 Content-Type: multipart/alternative; boundary="------------EGOsFkLvuLZQURroGN3PlFgs" --------------EGOsFkLvuLZQURroGN3PlFgs Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 U2luY2UgMTUuMSBpcyBhcHByb2FjaGluZyBJIG5vdyB3aXNoIHRvIGFkZCBhIDE1L3N0YWJs ZSB3b3JrIHRyZWUgdG8gbXkgDQpsb2NhbGx5IGNoZWNrZWQgb3V0IGJhc2UgcmVwby4NCg0K SSBjdXJyZW50bHkgaGF2ZSB0aGlzLCBoYXZpbmcgcHJ1bmVkIGJhY2sgdGhlIHJldmlzaW9u cyBJIG5vIGxvbmdlciB1c2U6DQoNCi91c3IvZ2l0L3NyY8KgIMKgIMKgIMKgIMKgIDYwYmFj NGQ2NDM4YiBbbWFpbl0NCi91c3Ivc3JjLjE0LVNUQUJMRcKgIMKgIGQxMTYwMDc0NTAwZCBb c3RhYmxlLzE0XQ0KL3Vzci9zcmMuMTQuMS1SRUxFQVNFIDA4OTJkZmYxMDQ0NCBbcmVsZW5n LzE0LjFdDQoNClRodXMgSSBzaG91bGQgYmUgYWJsZSB0byBkbywgZnJvbSB0aGUgYmFzZSAo dXNyL2dpdC9zcmMpOg0KDQpnaXQgd29ya3RyZWUgYWRkIC0tY2hlY2tvdXQgL3Vzci9zcmMu MTUtU1RBQkxFIHN0YWJsZS8xNQ0KDQphbmQgZXN0YWJsaXNoIHRoYXQuDQoNCkJ1dCB3aGVu IEkgZG8gaXQgaXQgQVBQRUFSUyB0byB3b3JrOg0KDQpbcm9vdEBOZXdGUyAvdXNyL2dpdC9z cmNdIyBnaXQgd29ya3RyZWUgYWRkIC0tY2hlY2tvdXQgDQovdXNyL3NyYy4xNS1TVEFCTEUg c3RhYmxlDQovMTUNClByZXBhcmluZyB3b3JrdHJlZSAoY2hlY2tpbmcgb3V0ICdzdGFibGUv MTUnKQ0KVXBkYXRpbmcgZmlsZXM6IDEwMCUgKDEwMTY3MC8xMDE2NzApLCBkb25lLg0KSEVB RCBpcyBub3cgYXQgNGI2ZGU2NGI5OWI5IGlwZndfbnB0djY6IGZpeCBoYW5kbGluZyB0aGUg aWZhZGRyIHJlbW92YWwgDQpldmVudA0KDQpIb3dldmVyLCB3aGVuIEkgZ28gdGhlcmUgYW5k IGxvb2suLi4uDQoNCltyb290QE5ld0ZTIC91c3Ivc3JjLjE1LVNUQUJMRV0jIGdpdCBicmFu Y2gNCiDCoCBsaXN0DQorIG1haW4NCisgcmVsZW5nLzE0LjENCiDCoCBzdGFibGUvMTINCiDC oCBzdGFibGUvMTMNCisgc3RhYmxlLzE0DQoqIHN0YWJsZS8xNQ0KDQpPaywgZXhjZXB0IHdo ZW4gSSBsb29rIGluIHN5cy9jb25mL25ld3ZlcnMuc2ggSSBmaW5kLi4uDQoNCi4uLi4NCg0K I8KgIMKgIMKgIMKgLXbCoCDCoCDCoCBQcmludCBUWVBFIFJFVklTSU9OIEJSQU5DSCBSRUxF QVNFIFZFUlNJT04gUkVMREFURSB2YXJpYWJsZXMNCiPCoCDCoCDCoCDCoCDCoCDCoCDCoCDC oGxpa2UgdGhlIC1WIGNvbW1hbmQNCiMNCg0KVFlQRT0iRnJlZUJTRCINClJFVklTSU9OPSIx NC40Ig0KQlJBTkNIPSJTVEFCTEUiDQppZiBbIC1uICIke0JSQU5DSF9PVkVSUklERX0iIF07 IHRoZW4NCiDCoCDCoCDCoCDCoCBCUkFOQ0g9JHtCUkFOQ0hfT1ZFUlJJREV9DQpmaQ0KdW5z ZXQgUkVMRUFTRQ0KdW5zZXQgVkVSU0lPTg0KDQpXaGljaCBpcyBub3Qgd2hhdCBJIGNoZWNr ZWQgb3V0IGFuZCBpdCBhcHBlYXJzIHRoZXJlIGlzIG5vIHRyYWNraW5nIA0KaW5mb3JtYXRp b24gc2V0IGVpdGhlcjoNCg0KW3Jvb3RATmV3RlMgL3Vzci9zcmMuMTUtU1RBQkxFXSMgZ2l0 IHB1bGwgLS1mZi1vbmx5DQpUaGVyZSBpcyBubyB0cmFja2luZyBpbmZvcm1hdGlvbiBmb3Ig dGhlIGN1cnJlbnQgYnJhbmNoLg0KUGxlYXNlIHNwZWNpZnkgd2hpY2ggYnJhbmNoIHlvdSB3 YW50IHRvIG1lcmdlIHdpdGguDQpTZWUgZ2l0LXB1bGwoMSkgZm9yIGRldGFpbHMuDQoNCiDC oCDCoCBnaXQgcHVsbCA8cmVtb3RlPiA8YnJhbmNoPg0KDQpJZiB5b3Ugd2lzaCB0byBzZXQg dHJhY2tpbmcgaW5mb3JtYXRpb24gZm9yIHRoaXMgYnJhbmNoIHlvdSBjYW4gZG8gc28gd2l0 aDoNCg0KIMKgIMKgIGdpdCBicmFuY2ggLS1zZXQtdXBzdHJlYW0tdG89ZnJlZWJzZC88YnJh bmNoPiBzdGFibGUvMTUNCg0KSXRzIGJlZW4gYSB3aGlsZSBzaW5jZSBJIHNldCB1cCB0aGUg b3RoZXJzLCBhbmQgdGhleSAqYXJlKiB3b3JraW5nIChhIA0KImdpdCBwdWxsIC0tZmYtb25s eSIgd29ya3MgYXMgZXhwZWN0ZWQgdG8gdXBkYXRlIHRoZW0pIHNvIEknbSBub3Qgc3VyZSAN CndoYXQgSSdtIG1pc3NpbmcgaGVyZS4uLi4gYW4gYXR0ZW1wdCB0byBwdWxsIGZyb20gd2hh dCBzaG91bGQgYmUgdGhlIA0KY29ycmVjdCBwbGFjZSByZXN1bHRzIGluIGEgaHVnZSBudW1i ZXIgb2YgY29uZmxpY3RzIGFuZCBhIHJlZnVzYWwgdG8gDQpjb21wbGV0ZS4NCg0KSSBhc3N1 bWUgbXkgd29ya3RyZWUgY29tbWFuZCBpcyB3cm9uZyBzaW5jZSBJIHJhdGhlci1vYnZpb3Vz bHkgZGlkbid0IA0KZ2V0IHN0YWJsZS8xNSBpbiB0aGVyZSBidXQgcmF0aGVyIDE0LjQtU1RB QkxFIChzdGFibGUvMTQpDQoNCi0tIA0KS2FybCBEZW5uaW5nZXINCmthcmxAZGVubmluZ2Vy Lm5ldA0KL1RoZSBNYXJrZXQgVGlja2VyLw0KL1tTL01JTUUgZW5jcnlwdGVkIGVtYWlsIHBy ZWZlcnJlZF0vDQo= --------------EGOsFkLvuLZQURroGN3PlFgs Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

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=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 60bac4d6438b [main]=
/usr/src.14-STABLE=C2=A0 =C2=A0 d1160074500d [stable/14]
/usr/src.14.1-RELEASE 0892dff10444 [releng/14.1]

Thus I should be able to do, from the base (usr/git/src):

git worktree add --checkout /usr/src.15-STABLE stable/15

and establish that.

But when I do it it APPEARS to work:

[root@NewFS /usr/git/src]# git worktree add --checkout /usr/src.15-STABLE stable
/15
Preparing worktree (checking out 'stable/15')
Updating files: 100% (101670/101670), done.
HEAD is now at 4b6de64b99b9 ipfw_nptv6: fix handling the ifaddr removal event

However, when I go there and look....

[root@NewFS /usr/src.15-STABLE]# git branch
=C2=A0 list
+ main
+ releng/14.1
=C2=A0 stable/12
=C2=A0 stable/13
+ stable/14
* stable/15

Ok, except when I look in sys/conf/newvers.sh I find...

....

#=C2=A0 =C2=A0 =C2=A0 =C2=A0-v=C2=A0 =C2=A0 =C2=A0 Print TYPE REVI= SION BRANCH RELEASE VERSION RELDATE variables
#=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0like the -V= command
#

TYPE=3D"FreeBSD"
REVISION=3D"14.4"
BRANCH=3D"STABLE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
=C2=A0 =C2=A0 =C2=A0 =C2=A0 BRANCH=3D${BRANCH_OVERRIDE}
fi
unset RELEASE
unset VERSION

Which is not what I checked out and it appears there is no tracking information set either:

[root@NewFS /usr/src.15-STABLE]# git pull --ff-only
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

=C2=A0 =C2=A0 git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

=C2=A0 =C2=A0 git branch --set-upstream-to=3Dfreebsd/<branch>= stable/15

Its been a while since I set up the others, and they *are* working (a "git pull --ff-only" works as expected to update them) so I'm not sure what I'm missing here.... an attempt to pull from what should be the correct place results in a huge number of conflicts and a refusal to complete.

I assume my worktree command is wrong since I rather-obviously didn't get stable/15 in there but rather 14.4-STABLE (stable/14)

--
Karl Denninger
karl@denninger.net
The Market Ticker
[S/MIME encrypted email preferred]<= /div> --------------EGOsFkLvuLZQURroGN3PlFgs-- --------------ms080609060409070906000007 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgMFADCABgkqhkiG9w0BBwEAAKCC C4owggWZMIIDgaADAgECAhRZU8dKdMneRI1Vq5kv0k54Q5rQuDANBgkqhkiG9w0BAQsFADB2 MQswCQYDVQQGEwJVUzESMBAGA1UECAwJVGVubmVzc2VlMRYwFAYDVQQKDA1EZW5uaW5nZXIu TmV0MRcwFQYDVQQDDA5EZW5uaW5nZXIgUm9vdDEiMCAGCSqGSIb3DQEJARYTYWRtaW5AZGVu bmluZ2VyLm5ldDAeFw0yNDA1MDkyMTA4MDNaFw00NDA1MDQyMTA4MDNaMF0xCzAJBgNVBAYT AlVTMRIwEAYDVQQIDAlUZW5uZXNzZWUxFjAUBgNVBAoMDURlbm5pbmdlci5uZXQxIjAgBgNV BAMMGURlbm5pbmdlci5OZXQgU2lnbmluZyBJbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw ggEKAoIBAQDbR0tSiuLG5HPfo+cWtdeYQ8jc8Bjfuo0GTcNRT0glHnH1apUtInIktUknEZDH ohahInN+mMBdKg54FCHOiYZrJbyxBIo9FwX7hRmOc+spxmSYWnOd2E/YcGInMK4ZpjPzldzB Yt1n3zygkhx2bssxTJS3x4nv1qAXfLSZd1VwqoQufifEoPyTtymkkvHLv86vLgqAqooM/cXc 4LSIQ5u2uM308n42r8RkKtp7X1v9fJW8oRZN2XnFZtiUPH44YY2rHqyN2Hea9Y3+TXbldXjo xhPHTA+JYVFq8KTmbQBqU7YcMhlIG0cSxPeFLMxnP6pqPcIVTAlK+a6YGRFppfjZAgMBAAGj ggE2MIIBMjAdBgNVHQ4EFgQUH+VuxXhBxaJAQrvDekwkH91hBi4wgbMGA1UdIwSBqzCBqIAU RFYC4p6L6KITnEvrpx2cyt+PcMmheqR4MHYxCzAJBgNVBAYTAlVTMRIwEAYDVQQIDAlUZW5u ZXNzZWUxFjAUBgNVBAoMDURlbm5pbmdlci5OZXQxFzAVBgNVBAMMDkRlbm5pbmdlciBSb290 MSIwIAYJKoZIhvcNAQkBFhNhZG1pbkBkZW5uaW5nZXIubmV0ghQZE7NBItWtQsCouuwU6jZ+ HPPwnjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA6BgNVHR8EMzAxMC+gLaAr hilodHRwOi8vd3d3LmRlbm5pbmdlci5uZXQvcm9vdC1yZXZva2VkLmNybDANBgkqhkiG9w0B AQsFAAOCAgEAfFbhPc82AfhyUqONs7IccYD36w+OP4nQgwfC4IWf3y/aQAZ2Zk6IITzYqwf7 PFM0bJRT3zi7xyetolqHDhfMJvnOQWpITZiyM/FSKwIvuBsy/uJUqPuqui4XQMYoSbAA1qmI MW/z7VZZHwaRFoeWE40UirYcf0fNcooBZ72bmd+iBaVyjtZvky0Vgcz0eC6e6LR5kNb23yC6 TkyQIlGyQkK5/afXUYFzk49rOHVbVyxW3oXRfq8Ow6HCrpDGAS8p84S04MFwBVAUfbe4aXs3 bampaI2LzKgkVywyFP14LSvvdjCfLYfnLy1Z9hm2EHMqNHA2tCGdRhWp2d7aZC1MYFqng0ZS fjPJjqHrI1qPU0p6k9A1GxAtrQlL2v/IUzUnMZkiawFV3qlxMGZf/kTYTUOcJhx1KU4zSLHu 80qO7ldRpp5gHssCAGFbeTu2gp6LxfmaFhLPDBJ1VGfdPx9lUrU/9OcoHczcl5x2Rb8IUZyX 9elzP5WdAU8p5R/DLlOAq24VcabhFtYBCA2dOESLupSfWKNQuJCN/1gz7ysSc+mjnnPV77IO mpszJfkFFJEDNJlGIVKX1vwwygtC/9Ulox8frgbZlRAYAgDc/YbOBFxticVVre0Y3Ujx6Kzb tkgZRlgfdZWbT1W5smncqJxg5qAL8e/yTb3fCe2nJ0jhiP4wggXpMIIE0aADAgECAhMAmNFt CiCF3j+FwQLYtBTmGjzkMA0GCSqGSIb3DQEBCwUAMF0xCzAJBgNVBAYTAlVTMRIwEAYDVQQI DAlUZW5uZXNzZWUxFjAUBgNVBAoMDURlbm5pbmdlci5uZXQxIjAgBgNVBAMMGURlbm5pbmdl ci5OZXQgU2lnbmluZyBJbnQwHhcNMjQwNTEwMTkyNjU5WhcNMjkwNTA5MTkyNjU5WjBXMQsw CQYDVQQGEwJVUzESMBAGA1UECAwJVGVubmVzc2VlMRcwFQYDVQQKDA5LYXJsIERlbm5pbmdl cjEbMBkGA1UEAwwSa2FybEBkZW5uaW5nZXIubmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A MIICCgKCAgEAvh1UssVbSYctzobPjwBkbjv/w4WvQNepeRTwE6+sLnXvc41+X9pa5EclPL4Q l02Vu1m71mSqXGfK9HbWZoivbhefBHOoYb35MSc24PelhwcORbpneWoWc7giQ7QgFlvEe/yj fs8M0H9fgdzFS5m2lwBQbis8kioSjHB2yt/8I1GE4Mvt1Cur9kga6ML5FAQvo8TYN1stdhrE 13FEv/BWCF4FVT4H2Wa2ySW+R1jkKb74SC6Twg98bGCRTShD5bVylh0+0LXNhzaopIDcI/KK jm/j3mRjIlmqbGrSpvJsbjjhjhAYQKE1U8FB5TDU4OkFAibblhQit/KjgspPR2o/vOpVFPER uhZEV1oDGzUJtZlkREIcN2sYBi0p7Y4585ya+b7L10mEenPlyi3eSkGXEuiy/BR2DY6lShwW DPoQ5602TKmttCSwBdWGoLrQ4jEVEVNt4lku2wPbTHF3KpHJU0g7RbcWoUYn10SOxKathkir hF3v9U32+QhPELGwqRrH0sL9rWf0qalRtPDHUYl8TebZmYkFqNeSMlqHijl5f4SsQPSj7gx5 4F19Ntm9ZcvuWTmW8QQGWTKHeMuG+BYkVIUSPe6/ZQsbD/xDx7rkyGfNgWIa4W7Wm/B7kaNq H53tk3wFmNgZQOxMTPF0oTHfW0T2azU6JD0D1AlgoAnSAE0CAwEAAaOCAaYwggGiMDoGCCsG AQUFBwEBBC4wLDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AuZGVubmluZ2VyLm5ldDo3Nzc3 MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr BgEFBQcDBDAzBglghkgBhvhCAQ0EJhYkT3BlblNTTCBHZW5lcmF0ZWQgQ2xpZW50IENlcnRp ZmljYXRlMB0GA1UdDgQWBBSxJZjVnlYLAT3uzvDYgc4742J6UTCBswYDVR0jBIGrMIGogBQf 5W7FeEHFokBCu8N6TCQf3WEGLqF6pHgwdjELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCVRlbm5l c3NlZTEWMBQGA1UECgwNRGVubmluZ2VyLk5ldDEXMBUGA1UEAwwORGVubmluZ2VyIFJvb3Qx IjAgBgkqhkiG9w0BCQEWE2FkbWluQGRlbm5pbmdlci5uZXSCFFlTx0p0yd5EjVWrmS/STnhD mtC4MB0GA1UdEQQWMBSBEmthcmxAZGVubmluZ2VyLm5ldDANBgkqhkiG9w0BAQsFAAOCAQEA TrQ45/tBN3SiuqItFv/V+CF3h7Hxe0YLsL+A/P+q9ZhxIscaNjaclgQhPA+rUr+l8DGoXJ/w yAl1E0SSBK+9phIc/9xFOBg3rCy4ngubzP+lHS1t03nMCBSUNsu5qPzqLBPiKaPabUu3Gr9o koRezSszgM3/zNJfr8cMO93csCK/fBccsMx5q+3nxB5XeT7UciicjfEzUA4m2mQxBmGk9SSU 147Gy8UmdSq57Tw82KqUrQ1pJ6IOzVPLREpwlqGbHykSU3MwtPYPtfQeFVjvO/XcWvoFQjbV UyhzAqMMYFudxoVLlJQiAgU38OScTLDgKxCO41h7VOjb2mss0zHndzGCBZUwggWRAgEBMHQw XTELMAkGA1UEBhMCVVMxEjAQBgNVBAgMCVRlbm5lc3NlZTEWMBQGA1UECgwNRGVubmluZ2Vy Lm5ldDEiMCAGA1UEAwwZRGVubmluZ2VyLk5ldCBTaWduaW5nIEludAITAJjRbQoghd4/hcEC 2LQU5ho85DANBglghkgBZQMEAgMFAKCCAvIwGAYJKoZIhvcNAQkDMQsGCSqGSIb3DQEHATAc BgkqhkiG9w0BCQUxDxcNMjYwNDE5MTYyNDI5WjBPBgkqhkiG9w0BCQQxQgRARS33gIfXBIxb T4wyp/iOuD248rkQoEJzYG4yqFZh9nXZL0Fk7cDXNjaSWwbfqUC/I4QcdCQBwXKe2Agrti8J pjCBgwYJKwYBBAGCNxAEMXYwdDBdMQswCQYDVQQGEwJVUzESMBAGA1UECAwJVGVubmVzc2Vl MRYwFAYDVQQKDA1EZW5uaW5nZXIubmV0MSIwIAYDVQQDDBlEZW5uaW5nZXIuTmV0IFNpZ25p bmcgSW50AhMAmNFtCiCF3j+FwQLYtBTmGjzkMIGFBgsqhkiG9w0BCRACCzF2oHQwXTELMAkG A1UEBhMCVVMxEjAQBgNVBAgMCVRlbm5lc3NlZTEWMBQGA1UECgwNRGVubmluZ2VyLm5ldDEi MCAGA1UEAwwZRGVubmluZ2VyLk5ldCBTaWduaW5nIEludAITAJjRbQoghd4/hcEC2LQU5ho8 5DCCAVcGCSqGSIb3DQEJDzGCAUgwggFEMAsGCWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYI KoZIhvcNAwcwDQYIKoZIhvcNAwICAQUwDQYIKoZIhvcNAwICAQUwBwYFKw4DAgcwDQYIKoZI hvcNAwICAQUwBwYFKw4DAhowCwYJYIZIAWUDBAIBMAsGCWCGSAFlAwQCAjALBglghkgBZQME AgMwCwYJYIZIAWUDBAIEMAsGCWCGSAFlAwQCBzALBglghkgBZQMEAggwCwYJYIZIAWUDBAIJ MAsGCWCGSAFlAwQCCjALBgkqhkiG9w0BAQEwCwYJK4EFEIZIPwACMAgGBiuBBAELADAIBgYr gQQBCwEwCAYGK4EEAQsCMAgGBiuBBAELAzALBgkrgQUQhkg/AAMwCAYGK4EEAQ4AMAgGBiuB BAEOATAIBgYrgQQBDgIwCAYGK4EEAQ4DMA0GCSqGSIb3DQEBAQUABIICAANRZAqf4rFT8yWS y99E8UgtU/mXk5VDAes14G0mPTln+EwqzT+xHYcQqSfne007w3XmaxAv+H1+eK9BA2T0J7Zq jQ3mYlxOQDvA3VT3OI6nDSp5jq2I88wFnpXDFu1KF9jcSt1Z/tKghloPs6YhQk4zqafb1nYn LVV7rH+yowLQP9sTeyAsWKI7WdMslqooia1YYCLKd96j8LksRdB8N5TIb5w+Dj3qOuVzjKk8 KoJNReJEEcLNKiXttt3tPIMfQaOy5PqKgd0dIM39hlUkRy9eiCpjy6Z+diA/86WFZEqh2LQD JqhOvwdvT92QpyyqqNuo5U92YVtEWlgUSVI1VkiVamZu8aeWamddLGqI2JaOeah37q+R1xEO Ty0+JObsTLzgiVZdh1joH/lbLumN6yoso65SKghOJewAAq57feaHSgBs78mS6396cgzdVnq7 yFro/m9MLkYgWz2jqNhqWg6Y2r6QIuMbeTjdO7Czi5Yz2WtzoF03wpy1kHz4CJSkg1R7Ptsw eNQvwhVp8Q+kdmHP6G4us62Qdp9ILbwozdZr0XJy6AN9YUWW8x4jdmRnZ6xZR5vVja2ls6CB tAvtNQMNKIIbjCf/MMcUTAVuOHtbDEahEkEo5wetczL/baOqOQOOckjD0pHUSSXAoDxHjIda hJ3R18kqWo/QW2s07sbrAAAAAAAA --------------ms080609060409070906000007-- 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