From nobody Tue Jun 08 10:41:14 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 D25FFF7961E for ; Tue, 8 Jun 2021 10:41:25 +0000 (UTC) (envelope-from lwhsu@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 4Fzmxd5bjwz3vNW; Tue, 8 Jun 2021 10:41:25 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id A42727309; Tue, 8 Jun 2021 10:41:25 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f178.google.com with SMTP id b9so29485463ybg.10; Tue, 08 Jun 2021 03:41:25 -0700 (PDT) X-Gm-Message-State: AOAM530jlO+8e/5fEX5xgzYgZJQ3ipj3ZXLADe1fzTk5sqNrMKW1YJsr MEhsd5rNTBF9t0gCiSH9QpzZ0O6QnjFRbjYQcXg= X-Google-Smtp-Source: ABdhPJwWuNpsrpCn5LACFh8GzaexGmb4mJCcR/rsGGB9ZFDWXEahJQrS1VBnwXkOT4VeTbOe56utLUZm9QijpZxnzcM= X-Received: by 2002:a25:c792:: with SMTP id w140mr29306888ybe.451.1623148885316; Tue, 08 Jun 2021 03:41:25 -0700 (PDT) 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 References: In-Reply-To: From: Li-Wen Hsu Date: Tue, 8 Jun 2021 18:41:14 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: OpenZFS imports, status update To: freebsd-git Cc: Martin Matuska , =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , Warner Losh , Xin LI Content-Type: text/plain; charset="UTF-8" X-ThisMailContainsUnwantedMimeParts: N On Tue, Jun 8, 2021 at 6:29 AM Li-Wen Hsu 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