In-Reply-To: <r6qli5s26bweu54yoohgczlghzrfu2myo6vtd43dixazycjcau@wxwpbf5owlad> References: <hfpfz2mxncfocr6egfvc7qqh35t4gwvjmbume2vxbbby5uaydv@rryzvvfwayhh> <agH4_rcDCYMEBqdp@albert.catwhisker.org> <r6qli5s26bweu54yoohgczlghzrfu2myo6vtd43dixazycjcau@wxwpbf5owlad>
index | | previous in thread | raw e-mail
[-- Attachment #1 --] On Mon, May 11, 2026 at 04:01:47PM +0000, Shawn Webb wrote: > On Mon, May 11, 2026 at 08:42:54AM -0700, David Wolfskill wrote: > > On Mon, May 11, 2026 at 03:25:04PM +0000, Shawn Webb wrote: > > > Hey all, > > > > > > It appears something's amiss in the FreeBSD ports repo: > > > > > > ==== BEGIN LOG ==== > > > $ git fetch upstream > > > remote: Enumerating objects: 782, done. > > > remote: Counting objects: 100% (530/530), done. > > > remote: Compressing objects: 100% (10/10), done. > > > remote: Total 782 (delta 524), reused 520 (delta 520), pack-reused 252 (from 1) > > > Receiving objects: 100% (782/782), 872.09 KiB | 173.00 KiB/s, done. > > > Resolving deltas: 100% (578/578), completed with 497 local objects. > > > From ssh://git.FreeBSD.org/ports > > > bd02c95174ef..8bdb30c6d549 2026Q2 -> upstream/2026Q2 > > > 39fabf7c0bc8..b7d1ffb8f542 main -> upstream/main > > > > As of this writing, b7d1ffb8f542 is the most recent commit shown in the > > archives of dev-commits-ports (at > > https://lists.freebsd.org/archives/dev-commits-ports-main/2026-May/date.html). > > > > > shawn-framework-01[shawn]:/usr/ports $ git merge upstream/main > > > fatal: unable to read blob object e5a98d716225916ee8024ebf9d1ad2b6e8c58ced > > > > There is no entry in the above-cited archives for a commit that would > > match that hash. > > > > > $ git remote -v > > > github git@github.com:HardenedBSD/ports.git (fetch) > > > github git@github.com:HardenedBSD/ports.git (push) > > > origin git@git.hardenedbsd.lan:HardenedBSD/ports.git (fetch) > > > origin git@git.hardenedbsd.lan:HardenedBSD/ports.git (push) > > > rad rad://z2XrdvALg77ycnuZRXgScb27yb3wM (fetch) > > > rad rad://z2XrdvALg77ycnuZRXgScb27yb3wM/z6Mkp9s3W8zN2qigmUirtvJ8NesXXZkYsYC6XEjdGcSXFeeR (push) > > > tor git@git.hardenedbsd.tor:HardenedBSD/ports.git (fetch) > > > tor git@git.hardenedbsd.tor:HardenedBSD/ports.git (push) > > > upstream ssh://anongit@git.FreeBSD.org/ports.git (fetch) > > > upstream ssh://anongit@git.FreeBSD.org/ports.git (push) > > > ==== END LOG ==== > > > > > > `git show e5a98d716225916ee8024ebf9d1ad2b6e8c58ced` shows the commit, > > > but only the payload, not the commit message. > > > .... > > > > My last local update for ports was at main-n746034-8c7b79314654 > > ("archivers/p5-Archive-Tar: update to 3.06"); my local private mirror, > > when asked about e5a98d716225916ee8024ebf9d1ad2b6e8c58ced, does not > > whine ("fatal: bad object ..."), as it does for a hash that does not > > correspond to a commit... but it also declines to say anything at all > > about it (using "git log" or "git show"): > > > > g1-120(15.1-S)[12] dirs > > /usr/ports > > g1-120(15.1-S)[13] git show -n 1 e5a98d716225916ee8024ebf9d1ad2b6e8c58ced | hd > > g1-120(15.1-S)[14] git log -n 1 e5a98d716225916ee8024ebf9d1ad2b6e8c58ced | hd > > g1-120(15.1-S)[15] echo $? > > 0 > > The commit can be found here, too: > https://cgit.freebsd.org/ports/commit/e5a98d716225916ee8024ebf9d1ad2b6e8c58ced > > It's currently the HEAD of the FreeBSD ports tree. Huh. Running my fetch and merge commands again seemed to make things happy again: ==== BEGIN LOG ==== $ git log -n 5 | cat commit 38c579356349c95ef03c7ed3f94a160852154c9c (HEAD -> hardenedbsd/main, rad/hardenedbsd/main, rad/HEAD) Good "git" signature for shawn.webb@hardenedbsd.org with ED25519 key SHA256:xmKeDrbJmED0JCvADm9SeneXtbJ8ETy14fq3/CDnes4 Merge: 396b00a81d27 e503f396ac9e Author: Shawn Webb <shawn.webb@hardenedbsd.org> Date: Mon May 11 16:19:15 2026 +0000 Merge remote-tracking branch 'upstream/main' into hardenedbsd/main commit e503f396ac9e3fc1c061862322ef184c2ae908b1 (upstream/main, upstream/HEAD) Author: Kenneth Raplee <kenrap@FreeBSD.org> Date: Mon May 4 08:42:43 2026 -0700 x11/waylock: Convert to USES=zig PR: 294741 Approved by: arrowd (co-mentor) commit cd4f167a18d97e3b3afada61ef579d9a7ef3781f Author: Kenneth Raplee <kenrap@FreeBSD.org> Date: Mon May 4 08:41:08 2026 -0700 x11/ly: Update to 1.4.0 PR: 294741 Approved by: arrowd (co-mentor) commit 38c8c850838f216b067ec9fe420753762b3c3a6c Author: Kenneth Raplee <kenrap@FreeBSD.org> Date: Mon May 4 08:40:01 2026 -0700 x11/ghostty: Change to zig015 PR: 294741 Approved by: arrowd (co-mentor) commit c96494206dee1d0908ae745b1571c0b009ea2395 Author: Kenneth Raplee <kenrap@FreeBSD.org> Date: Mon May 4 08:39:30 2026 -0700 www/zine-ssg: Change to zig015 PR: 294741 Approved by: arrowd (co-mentor) ==== END LOG ==== Thanks, -- Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmoCAiQACgkQ/y5nonf4 4fot5g/8CXi7REFdHGcQijR8VsqFZcIi+KDUPRYHAaV4kclTY4JbbI+qnRDQ5lNu 13MbG4oZD4RMkhW3LvU++leHLlwo5xneDYJpxKrJBvBab//djKaQWWaW93l7hhil GugPPf1I/GSPysFKChHHAG2aBwNDBaLMyw2GzJ+PHAi2IfL2jI2hFuyqUWVrqtS/ 5eO4jOdWyCBAmda37Z93b04spWwCcyN39IXiO2tfzMlhvEzxFy8FADTO4x2sIc+x MMoXVkS687spH8BPMqkLDMdIj8FBZW3AlFtrzcfE6dzLBPvMnmGmGGXm8VWpYNdM /Ox0MC4n8B0LmqnUx8/2UCCFLDhZlvGw9gmEXuDd45xVQpCDpdDiQj6QH243X9D4 9+DwuBwgKBcz3SMkP+GdUnMQCAWIssGw2+oFQmmhSb4TKaQBW7Q4peJXPk7Oc62t XiPWuTU/5x+pgsOUHSt+qn5gF6dPzPIlCw+GVQeCFL6aLQHoijDqdADiTCdzV9lG 9OmNo516aG7NduqoNtPf3C5YHxDdRJ6CCx+OKsGUHxoU/XBg7DOjwCMKYqJCXpFs UmUx2qvHXDdKhNsE36TfJQTkLsh1Q8nu+ElghFJG+N8T08vie3FBaHjFXsffeppu hbxt4PiI+g3ZehRq8125wGLvQS2C1+8G7MX9z/RIxg5S3b89Dcw= =Mwz6 -----END PGP SIGNATURE-----home | help