From nobody Wed Aug 2 21:43:09 2023 X-Original-To: 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 4RGQTK6vnqzZpBT for ; Wed, 2 Aug 2023 21:43:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RGQT84LNbz3hX7 for ; Wed, 2 Aug 2023 21:43:24 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20221208.gappssmtp.com header.s=20221208 header.b=vVKSM5rm; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::536) smtp.mailfrom=wlosh@bsdimp.com; dmarc=none Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-522c9d388d2so250900a12.3 for ; Wed, 02 Aug 2023 14:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1691012601; x=1691617401; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=5TRILcr6DRC+UGH122iLi24EvO1C0D6YXtKwM++y6eI=; b=vVKSM5rmzu14n+catm3HDzRvwdlNeX/1ejxOz/vnlwZBjdIcaUXB9asfIZ6vq7nOcc yXM5r18GhGRl245k1Tik5tiXciqZPNR1YwhvLaJw5i4frJpAF5cHafEMx0mgdvemWCkD /PL6Ir0WtHuYXgQIejv+i9Yxuei3pdR5BMu+YGhWKDKYli7jEU8jIr5X5okyQnj+XQZJ rSWsLVORE6/aLSUUSwP0ANvhgM/kHvEMu0oSgwzkmdtHBJaRkXh15+NLcH7kRvIVtotv iWfavDkB1mSFoorkBLd9+7rz9JewRg+6HILqBr6iwRu3MZsoYPhYxKVG789zXzWuGXyg JM6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691012601; x=1691617401; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5TRILcr6DRC+UGH122iLi24EvO1C0D6YXtKwM++y6eI=; b=SP8Ql/yiEYUaprnii9ey+CSd0QUIfqXU8jKWwMJf1xoMr8NhsTYXPn4fak6YdNUbXL nb/hIbhShb7FF2ZKJ+0B+UQ3RRM7s7ov5mMk4gzXZTf21+g2SlJrXnmbxv3lVaRvvxQF Erl4osf7DoTRJmXiuFRCT1+Xj4sy7PUkpS0lQTUSqAHe+Jv3/35GMOlmfpJGtvNDchB7 Bhvq8AXuwtsrENEGlQog2q6F9JAyxwWIp9zLBpDq5kB8MS35mNUCef6ZgZfWDEQTBFtC fuGFtQABBLQXxSShMJ2vNNaXYIu3OW3k08nzrDtaf6UCF0KOzzgnaKeO6oCvqkNXdwqx f3nQ== X-Gm-Message-State: ABy/qLb3YDXKe1ymzvHskYXKizZIeAN8RvQ19f/JdcdE5c7SQ4khgDkk sG7TS49SKhJn2rqGUq3kimpfanWOOYT7ercNS6+GAQhkFfAQ+WVrjk4= X-Google-Smtp-Source: APBJJlHCVdJLBS8P1U0Z9B3lLDqDV5jhSny6q5v5/mEfVeiF21tzr+6fyz/dzL/KdgCOVNCJkcdC0ZJGyzu5ZhMUPkw= X-Received: by 2002:aa7:c991:0:b0:522:2aee:6832 with SMTP id c17-20020aa7c991000000b005222aee6832mr6105947edt.9.1691012601080; Wed, 02 Aug 2023 14:43:21 -0700 (PDT) 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 References: <904p9s0n-6641-7494-q259-515pp4q313q1@yvfgf.mnoonqbm.arg> In-Reply-To: <904p9s0n-6641-7494-q259-515pp4q313q1@yvfgf.mnoonqbm.arg> From: Warner Losh Date: Wed, 2 Aug 2023 15:43:09 -0600 Message-ID: Subject: Re: fatal: unable to read To: "Bjoern A. Zeeb" Cc: git@freebsd.org Content-Type: multipart/alternative; boundary="00000000000065fdec0601f78d5b" X-Rspamd-Queue-Id: 4RGQT84LNbz3hX7 X-Spamd-Bar: -- X-Spamd-Result: default: False [-3.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20221208.gappssmtp.com:s=20221208]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; MLMMJ_DEST(0.00)[git@freebsd.org]; R_SPF_NA(0.00)[no SPF record]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::536:from]; DKIM_TRACE(0.00)[bsdimp-com.20221208.gappssmtp.com:+]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2] --00000000000065fdec0601f78d5b Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Jul 30, 2023 at 7:23=E2=80=AFPM Bjoern A. Zeeb < bzeeb-lists@lists.zabbadoz.net> wrote: > On Tue, 25 Jul 2023, Warner Losh wrote: > > > Have you tried cloning the repo? > > % git clone freebsd-src freebsd-src.x > Cloning into 'freebsd-src.x'... > done. > Updating files: 100% (94839/94839), done. > % > > Seems to run through without trouble like that. Are you suggesting that > I might just change my .git/config on the new one to point in the right > diretions again and use the cloned one (also re-establishing the > worktrees)? > I'm saying that if Marc and you can't work out why things are bad, cloning should preserve all the branches and you won't lose any work. You could script recreating the work trees, though that's a lot of disk and gets tricky if you like to stash changes... Worst case, though, is you'd have to clone the upstream repo and the fetch branches one at a time until you found the one causing the error (well, you'd fetch the rest, but then you'd know the problem child at least). I suspect it's a dangling reference somewhere that didn't get GC'd quite right and that it's an edge case in cleanup, but fixing botched repos is way abov= e my pay grade. Good luck and hope it all works out. And if there's anything I can do to help further, please let me know. Warner --00000000000065fdec0601f78d5b Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Sun, Jul 30, 2023 at 7:23=E2=80=AF= PM Bjoern A. Zeeb <bze= eb-lists@lists.zabbadoz.net> wrote:
On Tue, 25 Jul 2023, Warner Losh wrote:

> Have you tried cloning the repo?

% git clone freebsd-src freebsd-src.x
Cloning into 'freebsd-src.x'...
done.
Updating files: 100% (94839/94839), done.
%

Seems to run through without trouble like that.=C2=A0 Are you suggesting th= at
I might just change my .git/config on the new one to point in the right
diretions again and use the cloned one (also re-establishing the
worktrees)?

I'm saying that if Marc= and you can't work out why things are bad, cloning
should pr= eserve all the branches and you won't lose any work. You could
script recreating the work trees, though that's a lot of disk and get= s tricky
if you like to stash changes...

Worst case, though, is you'd have to clone the upstream repo and the f= etch
branches one at a time until=C2=A0you found the one causing = the error (well, you'd
fetch the rest, but then you'd kno= w the problem child at least).

I suspect it's = a dangling reference somewhere that didn't get GC'd quite right
and that it's an edge case in cleanup, but fixing botched repos = is way above
my pay grade.

Good luck and= hope it all works out. And if there's anything I can do to help
<= div>further, please let me know.

Warner
--00000000000065fdec0601f78d5b--