Date: Thu, 10 Jun 2021 20:13:19 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: Li-Wen Hsu <lwhsu@freebsd.org> Cc: freebsd-git <freebsd-git@freebsd.org> Subject: Re: [HEADS UP] Rename of the vendor/openzfs branch Message-ID: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> In-Reply-To: <CAKBkRUxtT9xz2UK%2B5RLcjFA7uvzzYQfNEG%2BmxLAYC8iwg5Wq_w@mail.gmail.com> References: <CAKBkRUxtT9xz2UK%2B5RLcjFA7uvzzYQfNEG%2BmxLAYC8iwg5Wq_w@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
8 juin 2021 13:47:04 Li-Wen Hsu <lwhsu@freebsd.org>: > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7acba8e0-0b51-41b2-b8e7-769cc163ec10>