From nobody Thu Jun 10 20:13:19 2021 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 C99137E84FC for ; Thu, 10 Jun 2021 20:13:23 +0000 (UTC) (envelope-from bapt@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G1FXg5NkJz4XfL; Thu, 10 Jun 2021 20:13:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 881CD2353; Thu, 10 Jun 2021 20:13:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [127.0.0.1] (10.246.39.62.rev.sfr.net [62.39.246.10]) (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 aniel.nours.eu (Postfix) with ESMTPSA id 508BF4F2D3; Thu, 10 Jun 2021 22:13:21 +0200 (CEST) Date: Thu, 10 Jun 2021 20:13:19 +0000 (UTC) From: Baptiste Daroussin To: Li-Wen Hsu Cc: freebsd-git Message-ID: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> In-Reply-To: References: Subject: Re: [HEADS UP] Rename of the vendor/openzfs branch 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=UTF-8 Content-Transfer-Encoding: quoted-printable X-Correlation-ID: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> X-ThisMailContainsUnwantedMimeParts: N 8 juin 2021 13:47:04 Li-Wen Hsu : > Hello, > > As mentioned in the "OpenZFS imports, status update": > > =C2=A0=C2=A0=C2=A0 https://lists.freebsd.org/archives/freebsd-git/2021-Ju= ne/000013.html > > We're going to rename the current openzfs vendor branch, > vendor/openzfs, to vendor/openzfs/legacy > and import directly the master and zfs-2.1-release branches from the > upstream OpenZFS to vendor/openzfs/* for merging to our main and > stable/13 branches. The details can be found in the mail above. > > The people have local branch tracking the original vendor/openzfs may > encounter error message like this whey doing `git pull`: > > =C2=A0=C2=A0=C2=A0 error: cannot lock ref > 'refs/remotes/freebsd/vendor/openzfs/legacy': > 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create > 'refs/remotes/freebsd/vendor/openzfs/legacy' > > The solution is update the upstream of the tracking branch: > > =C2=A0=C2=A0=C2=A0 (change "freebsd" to "origin" if you use the default r= emote name) > =C2=A0=C2=A0=C2=A0 git remote prune freebsd > =C2=A0=C2=A0=C2=A0 (on your tracking branch) > =C2=A0=C2=A0=C2=A0 git branch -u freebsd/vendor/openzfs/legacy > > If you don't want the first command prune all the branches not > existing in the remote repository, use this: > > =C2=A0=C2=A0=C2=A0 git update-ref -d refs/remotes/freebsd/vendor/openzfs > =C2=A0=C2=A0=C2=A0 (also, change "freebsd" to "origin" if you use the def= ault remote name) > > After that you can do `git pull` or `git fetch` as usual. > > If you have any questions, please post on -git@ list. > > Best, > Li-Wen For your information this broke gitlab mirroring... I don t when I can have= the ability to fix Bapt