Date: Tue, 8 Jun 2021 18:41:14 +0800 From: Li-Wen Hsu <lwhsu@freebsd.org> To: freebsd-git <freebsd-git@freebsd.org> Cc: Martin Matuska <mm@freebsd.org>, =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>, Warner Losh <imp@freebsd.org>, Xin LI <delphij@freebsd.org> Subject: Re: OpenZFS imports, status update Message-ID: <CAKBkRUzh7w1ZhuDggdB-KnUaWb-bOtHQp%2BzHR%2B1znQ9FXGoXsA@mail.gmail.com> In-Reply-To: <CAKBkRUxeoPwW1ZgwL13=8XkgJv9z8Y55h1TuU8SYoN_0w0qbUQ@mail.gmail.com> References: <CANCZdfrM5rKo6AKhHMCbp3O8ZoxqCkGNT3aRrSwE%2B6HzS7MDJA@mail.gmail.com> <aed58350-a351-7fb0-ee22-daa6d41ed2c9@FreeBSD.org> <YIMtD4SA9e9VTsez@acme.spoerlein.net> <CAKBkRUxeoPwW1ZgwL13=8XkgJv9z8Y55h1TuU8SYoN_0w0qbUQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jun 8, 2021 at 6:29 AM Li-Wen Hsu <lwhsu@freebsd.org> wrote: > And to allow creating master and zfs-2.1-release branches in the > vendor/openzfs namespace, we need to rename the original > vendor/openzfs to create rooms for them. Because we disallow deleting > branches or other destructive operations from remote and it's not that > cost-effective to modify the configuration and hooks for this single > operation. I would like to just rename the branch on the server, with > command: > > git branch -m vendor/openzfs vendor/openzfs/legacy So we're taking this route after discussing it with imp@ and delphij@. I'll send a heads-up for this. > 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/vendor/openzfs' exists; cannot create > 'refs/remotes/freebsd/vendor/openzfs/legacy' > > The solution is update the upstream of the tracking branch: > > (change "freebsd" to "origin" if you use default remote name) > git update-ref -d refs/remotes/freebsd/vendor/openzfs And we'll primarily suggest people using: git remote prune freebsd (or "origin", depends on the remote name you use) > git branch -u freebsd/vendor/openzfs/legacy vendor/openzfs/legacy
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAKBkRUzh7w1ZhuDggdB-KnUaWb-bOtHQp%2BzHR%2B1znQ9FXGoXsA>