Re: OpenZFS imports, status update

2021-06-08 Thread Warner Losh
On Tue, Jun 8, 2021 at 4:58 PM Michael Tuexen < michael.tue...@macmic.franken.de> wrote: > > On 9. Jun 2021, at 00:52, Warner Losh wrote: > > > > Top posting... > > > > You can do a 'git remote purge freebsd' to reset the branch names, then > > you'll be able to do a normal pull. > Do you mean 'g

Re: OpenZFS imports, status update

2021-06-08 Thread Warner Losh
Top posting... You can do a 'git remote purge freebsd' to reset the branch names, then you'll be able to do a normal pull. Thanks for the feedback Warner On Tue, Jun 8, 2021 at 4:10 PM Mark Millard via freebsd-git < freebsd-...@freebsd.org> wrote: > Li-Wen Hsu wrote (in part) on > Date: Tue,

Re: OpenZFS imports, status update

2021-06-08 Thread Mark Millard via freebsd-git
Li-Wen Hsu wrote (in part) on Date: Tue, 8 Jun 2021 06:29:51 +0800 : > The people have local branch tracking the original vendor/openzfs will > encounter issues like this whey doing `git pull`: > > error: cannot lock ref > 'refs/remotes/freebsd/vendor/openzfs/legacy': > 'refs/remotes/freebsd