From nobody Tue Jun 08 11:45:04 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 40E725D1778;
	Tue,  8 Jun 2021 11:45:16 +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 4FzpMJ1Scpz4byh;
	Tue,  8 Jun 2021 11:45:16 +0000 (UTC)
	(envelope-from lwhsu@freebsd.org)
Received: from mail-yb1-f182.google.com (mail-yb1-f182.google.com [209.85.219.182])
	(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 165837C51;
	Tue,  8 Jun 2021 11:45:16 +0000 (UTC)
	(envelope-from lwhsu@freebsd.org)
Received: by mail-yb1-f182.google.com with SMTP id e10so29739003ybb.7;
        Tue, 08 Jun 2021 04:45:16 -0700 (PDT)
X-Gm-Message-State: AOAM532OrnIajuATzA42zAluQEWstF+hRVx6cTtNRN49SpXYy8a8+DAW
	qbAEHOsfsRpM/N1OUBfgHKCZRVdS1sBCsw3Mel8=
X-Google-Smtp-Source: ABdhPJw7CKPqx+Rl+61ihJSCpoHepoYFlM+op2Iiz8dj4iuWegSJY9kl2v7da3zbKB3KcftF6n7yFBEYea7b21rUxjQ=
X-Received: by 2002:a25:d412:: with SMTP id m18mr29469812ybf.110.1623152715464;
 Tue, 08 Jun 2021 04:45:15 -0700 (PDT)
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-git
List-Help: <mailto:freebsd-git+help@freebsd.org>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Subscribe: <mailto:freebsd-git+subscribe@freebsd.org>
List-Unsubscribe: <mailto:freebsd-git+unsubscribe@freebsd.org>
Sender: owner-freebsd-git@freebsd.org
MIME-Version: 1.0
From: Li-Wen Hsu <lwhsu@freebsd.org>
Date: Tue, 8 Jun 2021 19:45:04 +0800
X-Gmail-Original-Message-ID: <CAKBkRUxtT9xz2UK+5RLcjFA7uvzzYQfNEG+mxLAYC8iwg5Wq_w@mail.gmail.com>
Message-ID: <CAKBkRUxtT9xz2UK+5RLcjFA7uvzzYQfNEG+mxLAYC8iwg5Wq_w@mail.gmail.com>
Subject: [HEADS UP] Rename of the vendor/openzfs branch
To: freebsd-git <freebsd-git@freebsd.org>
Cc: freebsd-current <freebsd-current@freebsd.org>
Content-Type: text/plain; charset="UTF-8"
X-ThisMailContainsUnwantedMimeParts: N

Hello,

As mentioned in the "OpenZFS imports, status update":

    https://lists.freebsd.org/archives/freebsd-git/2021-June/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`:

    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 the default remote name)
    git remote prune freebsd
    (on your tracking branch)
    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:

    git update-ref -d refs/remotes/freebsd/vendor/openzfs
    (also, change "freebsd" to "origin" if you use the default 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