From nobody Tue Jun 08 22:52:43 2021 X-Original-To: freebsd-current@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 3FBE47EAE0E for ; Tue, 8 Jun 2021 22:52:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G059g12kJz3Jtv for ; Tue, 8 Jun 2021 22:52:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-lf1-x12a.google.com with SMTP id p17so33914815lfc.6 for ; Tue, 08 Jun 2021 15:52:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=NsRgF49iycAhCuzwHxRpKplmDVIhRHYX7aWH7WPjpQ8=; b=j5HQ3KXztJ8pJeftcOCEE7poQDORPA44jUDu6ApmUVTDjWL3yMkRJbo+C+Q/oezDyk IttAHsiCOIfyWfmWH+CV/A3nDRy5Rs73dcbyKpUCd/xClO8aVVesR3fxL0MHZGPs7VTv v8cbYLPp17Y4+F8EtNCkSGPuRgdF86OvaxJHTdr7M4P8Tv0D2MS/nYGhk/A1cPTYMaGl Aztnt34AYOwKcPZUB4aOon+7gaXkcO39+ki0lMn4r4d+XehbvHIVldjc55n0dAW15m1k BDQKfbtzL2fkSWUz67AHvdhD8fekh49az1knfLiMe8s5hpANGpfXlmhLzfMB7Jtcz6QR dMrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=NsRgF49iycAhCuzwHxRpKplmDVIhRHYX7aWH7WPjpQ8=; b=PoWmEg+K6e/H/4bcNmE0x6sN5TCEoBpIuplqO1nuyEZfNyz1RLc9q371xj2EXGrCVM 5Q1L+2QNcjaK9A4FaEb76xmqWpHMlCO6IkBmGi+ujYfwL3/3e0Yd4xhcXDHFORogHIEM NeyYn2K941CnBvzEiYBrVtJKmR4juYr2QjnT/t6Au0+q6gCnMU2Jo+mO1Wa8ziMFu2TZ /uFuQRUUmNlH6uuuWalN7aEivxck4VKXZ/87xWzbADcyEWBGEQBbm3ml55AYDI1r+39/ t8gDXtdrK1zc3DUIRcCWu5KwPE+28f9eJNmuprkajfIVRPa8w6p/FvAmVLDFdtFFCMsi GqJA== X-Gm-Message-State: AOAM532S2rB5hof+wqdPanZDPMK5tDt1kD9YMPASNmAUdgtxn4izFzeb bJq5vXI/IDuOqc+/xhhAYVfdSBD+IQBqH+a3XJ+7pA== X-Google-Smtp-Source: ABdhPJw36E2cxtdKAqa8x+8/48EOk6gj9caFXdn1KndjIbMs1bs5wa7ra5lRRnlrZf7cvvTOejoOQJc1DLntsFXbe7Q= X-Received: by 2002:a05:6512:3891:: with SMTP id n17mr17161378lft.333.1623192773707; Tue, 08 Jun 2021 15:52:53 -0700 (PDT) List-Id: Discussions about the use of FreeBSD-current List-Archive: https://lists.freebsd.org/archives/freebsd-current List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-current@freebsd.org MIME-Version: 1.0 References: <94FF271E-1397-42C5-8A9C-26E423D72701.ref@yahoo.com> <94FF271E-1397-42C5-8A9C-26E423D72701@yahoo.com> In-Reply-To: <94FF271E-1397-42C5-8A9C-26E423D72701@yahoo.com> From: Warner Losh Date: Tue, 8 Jun 2021 16:52:43 -0600 Message-ID: Subject: Re: OpenZFS imports, status update To: Mark Millard Cc: Li-Wen Hsu , freebsd-git , freebsd-current , FreeBSD-STABLE Mailing List Content-Type: multipart/alternative; boundary="000000000000adde8905c4490473" X-Rspamd-Queue-Id: 4G059g12kJz3Jtv X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: Y --000000000000adde8905c4490473 Content-Type: text/plain; charset="UTF-8" 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-git@freebsd.org> wrote: > 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/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 > > git branch -u freebsd/vendor/openzfs/legacy vendor/openzfs/legacy > > I guess I misunderstood the meaning of the wording. > I've never explicitly created a branch of or checked out > anything from vendor/ or below. So I was not expecting > anything. I do use main and stable/13 and releng/13.0 > explicitly in worktrees, no local commits involved for > the context that this is from. > > Looks like some implicit initial configuration defaults > mean "local branch tracking" of vendor/openzfs was > implicitly/automatically in use in a way that fits > the actual intent of the wording: > > # git fetch > remote: Enumerating objects: 21551, done. > remote: Counting objects: 100% (21551/21551), done. > remote: Compressing objects: 100% (152/152), done. > remote: Total 75711 (delta 21460), reused 21399 (delta 21399), pack-reused > 54160 > Receiving objects: 100% (75711/75711), 46.02 MiB | 4.74 MiB/s, done. > Resolving deltas: 100% (59104/59104), completed with 2449 local objects. > From https://git.FreeBSD.org/src > e5f5b6a75c0a..f20893853e8e main -> > freebsd/main > a4deddc0de32..53de482ad419 releng/11.4 -> > freebsd/releng/11.4 > f5ddeabc08e7..6e927d10c587 releng/12.2 -> > freebsd/releng/12.2 > 8023e729a521..b74cdf1eceae releng/13.0 -> > freebsd/releng/13.0 > dbb3df26a8a3..90e161ec6d11 stable/11 -> > freebsd/stable/11 > f146c0338c6c..0a41a2899eb2 stable/12 -> > freebsd/stable/12 > ddd0a8bffe35..04c4bd7f7b52 stable/13 -> > freebsd/stable/13 > 1e02e5b0ba86..395770967c36 vendor/acpica -> > freebsd/vendor/acpica > error: cannot lock ref 'refs/remotes/freebsd/vendor/openzfs/legacy': > 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create > 'refs/remotes/freebsd/vendor/openzfs/legacy' > ! [new branch] vendor/openzfs/legacy -> > freebsd/vendor/openzfs/legacy (unable to update local ref) > error: cannot lock ref 'refs/remotes/freebsd/vendor/openzfs/master': > 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create > 'refs/remotes/freebsd/vendor/openzfs/master' > ! [new branch] vendor/openzfs/master -> > freebsd/vendor/openzfs/master (unable to update local ref) > error: cannot lock ref > 'refs/remotes/freebsd/vendor/openzfs/zfs-2.1-release': > 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create > 'refs/remotes/freebsd/vendor/openzfs/zfs-2.1-release' > ! [new branch] vendor/openzfs/zfs-2.1-release -> > freebsd/vendor/openzfs/zfs-2.1-release (unable to update local ref) > efec8223892b..40c7ff83e74e vendor/wpa -> > freebsd/vendor/wpa > * [new tag] vendor/acpica/20210604 -> > vendor/acpica/20210604 > > So, for now, I then did: > > # git update-ref -d refs/remotes/freebsd/vendor/openzfs > # git fetch > From https://git.FreeBSD.org/src > * [new branch] vendor/openzfs/legacy -> > freebsd/vendor/openzfs/legacy > * [new branch] vendor/openzfs/master -> > freebsd/vendor/openzfs/master > * [new branch] vendor/openzfs/zfs-2.1-release -> > freebsd/vendor/openzfs/zfs-2.1-release > > This order was apparently a mistake in some way because > after it I then tried the other of the pair of commands > and got: > > # git branch -u freebsd/vendor/openzfs/legacy vendor/openzfs/legacy > fatal: branch 'vendor/openzfs/legacy' does not exist > > Yet what I see is: > > # git remote show freebsd > * remote freebsd > Fetch URL: https://git.FreeBSD.org/src.git > Push URL: https://git.FreeBSD.org/src.git > HEAD branch: main > Remote branches: > main tracked > refs/notes/commits tracked > . . . > releng/13.0 tracked > . . . > stable/13 tracked > . . . > vendor/openzfs/legacy tracked > vendor/openzfs/master tracked > vendor/openzfs/zfs-2.1-release tracked > . . . > Local branches configured for 'git pull': > main merges with remote main > releng/13.0 merges with remote releng/13.0 > stable/13 merges with remote stable/13 > > So I'm not sure if I have anything that is messed up > or not. Nothing looks odd to me, other than the one > command's output. > > > Overall it seems that most people not doing something > special with an initial git configuration for FreeBSD > so have to deal with the issue at hand explicitly in > some way. > > === > Mark Millard > marklmi at yahoo.com > ( dsl-only.net went > away in early 2018-Mar) > > > --000000000000adde8905c4490473--