From nobody Wed Oct 02 15:26:13 2024 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 4XJdtt5jz1z5Xglk for ; Wed, 02 Oct 2024 15:26:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJdtt58Bgz3wsB; Wed, 2 Oct 2024 15:26:14 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727882774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y6I8YIlL4xtyBl6v2yekGPw0Dd9VUy+ZNUtN81Y7q0E=; b=PmNHcXggNRVcC0J3VJ91YiILCJUrI1W2xizEuop24MF6UizBfMTmbpiL+TD1/hYjr5pi3B zRopdM2raxE9VvQ+yjd/uc5aSJBCNyHTBcO6sBnB6ClhkGjvt6bXfYxVa9Kxht58Db6Xz+ CViJYYffJLsm2VDayBj5mGiak2AMPZX+m+Aom7InOpI1B7VwBXzLLniN8QoG8bf5qx3hFW NA89wbk0ipjUQLXrFdAtJSZM1WR7xWT5M1aIfrqvoIp7zkaPpM+cFceyZGjwIfM0cqZicm IBBGSryNpPij+nZy9UkHFmPYC8faQWlicEOwiJ6eE6N8ZFBicOfjDLJGhRvnbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727882774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y6I8YIlL4xtyBl6v2yekGPw0Dd9VUy+ZNUtN81Y7q0E=; b=pD4Nl6kpRd3rVIXurlGGMchlw0HIvkKy5DDjMpt4P1CgyNy2YCc2TRZZSQ/J/VivsX52zH gl7LdMAPDrB3loxg9S7HQRrweYCBCR6ljBTUCuaXJtSi4pK9+miuh+BkNaPrMMG3vnqtKT Vv8nwZiyWUJDnnATLkzbdmoIR3eHmadxPjQ1veJ6v7/DDcB2NeeJdtRvnTW2C+9HeM/DgW Vsp/j/Zmg0A//HZdJgyXESk7L86Y/eEJSe+47HhpEzYr9C6awYdrL5eSlQb2kVVALrwLnK vwT9AsAUga2TqB2IPfYrBtPGAzCkwG9FPHpeOARM0WI+JC3H7Q39jszvjZVPPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727882774; a=rsa-sha256; cv=none; b=aU8OyHRU17BZ0YrokVNXAmalKGLxmoPh6A/sltSGiPpZer2src0NaVPo8q4kBuDSbFp3Z0 9QmHTO8IxaP6RfCp+jWSh5fA0HDKeQUCuWOKTzbJ8vyFzWJZvmG1XRynyCXJ9JgfsLEe6B UAyt/+KSbZCtivVwQT84FBAgOGAADN5EgOqMOi0hkuPGgLsa1nWnkhcI7LFWHad6j4htMy o+czYTsnbn63SwCHkKSPG/G++xOhLRG/Ee+i9VXBrm5Ul24S1zJsfLcOZsOxf8+6B9AIM0 /PHS6gPNBgYLnR8cuadzxVU7UGdiDjOUsHcOIj0OrH6/FvhTSmLUbcY16TvvYw== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (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) (Authenticated sender: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4XJdtt4YBszNnq; Wed, 2 Oct 2024 15:26:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id EAB6D3C019B; Wed, 02 Oct 2024 15:26:13 +0000 (UTC) Date: Wed, 2 Oct 2024 15:26:13 +0000 From: Brooks Davis To: Shawn Webb Cc: Matthias Fechner , git@freebsd.org Subject: Re: Impossible to push my ports directory to my CI/CD pipeline Message-ID: References: <483fb132-0d1c-443a-9b44-b7f2f087fb3d@freebsd.org> <736exensjgsyhbytunglk6qnk3dh4fyyvdc5jktzrv3zzujbgr@db6amzcu53h2> 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <736exensjgsyhbytunglk6qnk3dh4fyyvdc5jktzrv3zzujbgr@db6amzcu53h2> On Tue, Oct 01, 2024 at 07:37:00PM +0000, Shawn Webb wrote: > On Mon, Sep 30, 2024 at 01:09:32PM UTC, Matthias Fechner wrote: > > Dear all, > > > > I already tried to address that problem on the all-developer list, but it is > > maybe better to put it here. > > I think by accident someone pushed LFS object with a commit of java/eclipse. > > > > git remote -v > > freebsd git@gitrepo.freebsd.org:ports.git (fetch) > > freebsd git@gitrepo.freebsd.org:ports.git (push) > > freebsd-https?? https://git.freebsd.org/ports.git (fetch) > > freebsd-https?? https://git.freebsd.org/ports.git (push) > > githubfreebsd?? https://github.com/freebsd/freebsd-ports.git (fetch) > > githubfreebsd?? https://github.com/freebsd/freebsd-ports.git (push) > > origin? git@gitlab.fechner.net:mfechner/Gitlab.git (fetch) > > origin? git@gitlab.fechner.net:mfechner/Gitlab.git (push) > > > > git lfs fetch --all freebsd > > fetch: 22 object(s) found, done. > > fetch: Fetching all references... > > [99a670c083e000008ee29dd972b60cbad6ade1d6ec024b30ff45f41da3d19e1d] Object > > does not exist on the server: [404] Object does not exist on the server > > [c89e491472c8af1d153e2e2801836fad0e38f428d0250ed982e16baa5effbe4f] Object > > does not exist on the server: [404] Object does not exist on the server > > [f7db6794c6c3e7a03a3987537b8a0cdb1bde2996ed7c7eec50f2e5df1e7a30c2] Object > > does not exist on the server: [404] Object does not exist on the server > > [e8e2d306fd11358a07b4ee10bfef19de3b518793568fc498cdd989170d31712b] Object > > does not exist on the server: [404] Object does not exist on the server > > [5dbe70b5c83520df09c100815bb164c8903da5eb8bffbd094aaaed54b212d73a] Object > > does not exist on the server: [404] Object does not exist on the server > > [8813907b0f7b001080a346ed2d0307a1c749b85688fdfa1d270fe59a07aa3909] Object > > does not exist on the server: [404] Object does not exist on the server > > [1d41b04bdd4115c52aac8177e1b899403a3d7d9f6d147cd864463029648a4714] Object > > does not exist on the server: [404] Object does not exist on the server > > [c0155fc8e7c4b9736d81db638fed95bc9ff297453bfd0bbd7dd5d882ebca6e89] Object > > does not exist on the server: [404] Object does not exist on the server > > [6d0aef4ba9e96d4c63baae8db9cdce7c634140a2bda7da670e698e38e0df57ce] Object > > does not exist on the server: [404] Object does not exist on the server > > [a928176ec92ad347404b2454e5f4f321aaef8ba862a60b0c28adc3bdcc619a4a] Object > > does not exist on the server: [404] Object does not exist on the server > > [42fa73302624dc511e6d8958c66c82f31b8d9155f2980343b6bcdc25345e1dcd] Object > > does not exist on the server: [404] Object does not exist on the server > > [ed324ddc16ccb8b9fab3041da394b844166b6778c39cd12708bcade05b41c0da] Object > > does not exist on the server: [404] Object does not exist on the server > > [9ef847d4e699b5dbe49ac74ee35596fdddc22c6335bc96affee19a99ecd077f5] Object > > does not exist on the server: [404] Object does not exist on the server > > [f5417c277c6ca509334010bb6999c56c3ab5d3751204c74dc00c2fa25d93dfae] Object > > does not exist on the server: [404] Object does not exist on the server > > [a1ffa591430df806983c8798113264f12ea679bce4b785d70d2868dc91cec883] Object > > does not exist on the server: [404] Object does not exist on the server > > [b2e525c38598dac6885a75e7eaffa346c8aca3dbdda73cb0275f50103ec3d245] Object > > does not exist on the server: [404] Object does not exist on the server > > [5db9424884396cf5bfc46a6b22dacbe245f43a7e1eda6aeac831905dc921802e] Object > > does not exist on the server: [404] Object does not exist on the server > > [b5e05ef77effb4048e72e38605700151fdf4eae214cfa358e9e81a48e124cb52] Object > > does not exist on the server: [404] Object does not exist on the server > > [ca2c21bf21e1fa2f53c72653ea57e76506c305bdd44c6416542ebbf2ab8b1b83] Object > > does not exist on the server: [404] Object does not exist on the server > > [4fc786126dd64f936554a12c4752787c4989453654fc5d6fd119b6e5eeafec6f] Object > > does not exist on the server: [404] Object does not exist on the server > > [f56db5e81304e441260b84d6c2805ae7050ea56760d763d2b32e6be928fa1cae] Object > > does not exist on the server: [404] Object does not exist on the server > > error: failed to fetch some objects from > > 'https://github.com/freebsd/freebsd-ports.git/info/lfs' > > > > I have my own testing pipeline in place to automatically test my commits > > against changes I did to ports. > > > > But as LFS is now in the FreeBSD repository, but the files cannot be > > retrieved from the FreeBSD repository I'm now locked out for my CI/CD > > pipeline and my automated tests. > > > > If I now try to push to my local repo I get: > > > > git push origin > > Warning: untrusted X11 forwarding setup failed: xauth key data not generated > > Locking support detected on remote "origin". Consider enabling it with: > > ? $ git config > > lfs.https://gitlab.fechner.net/mfechner/Gitlab.git/info/lfs.locksverify true > > Unable to find source for object > > 99a670c083e000008ee29dd972b60cbad6ade1d6ec024b30ff45f41da3d19e1d (try > > running git lfs fetch --all) > > Uploading LFS objects:?? 0% (0/21), 0 B | 0 B/s, done. > > error: failed to push some refs to 'gitlab.fechner.net:mfechner/Gitlab.git' > > > > Does anyone have an idea how that can be fixed? > > Hey Matthias, > > With commit c94e4ced329298efb06189d1c6db26e3d6ff3eef[1], FreeBSD > introduced LFS objects into the ports git history. This commit was > reverted with commit 3ec21e417cd5752c96b88587a5a605567ba5cd19[2]. > > Even though the offending commit was reverted, the git commit history > still contains LFS references. This caused HardenedBSD's self-hosted > GitLab to become unhappy in exactly the same way yours did. > > I ended up disabling LFS for the ports repo in the GitLab side. This > caused GitLab to become happy again. Problem is, now everyone > downstream from us (and FreeBSD, too) will need to disable LFS on > their repos/forks, too. I'm curious if you can turn LFS back on once the broken change is past? That that ports should ever use LFS, but it seems somewhat better if GitLab configs only need to be non-default during bootstrapping. At this point there's probably nothing to be done other than workarounds as rewriting history to remove this stuff would be quite disruptive after several weeks of commits. We could really use some hooks to block both things that look like lfs metadata and submodule bits. (The latter is somewhat challenging in that we need to allow them on the vendor side to support OpenZFS.) -- Brooks