From nobody Tue Jun 08 22:09:54 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 1F3AA7CBFE8 for ; Tue, 8 Jun 2021 22:10:01 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic302-22.consmr.mail.gq1.yahoo.com (sonic302-22.consmr.mail.gq1.yahoo.com [98.137.68.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4G04D75RKmz4tCp for ; Tue, 8 Jun 2021 22:09:59 +0000 (UTC) (envelope-from marklmi@yahoo.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1623190198; bh=X3IxrDALxbLxBlou6C1bImp+k4GR1KUfRWd7fA/o8r0=; h=From:Subject:Date:Cc:To:References:From:Subject:Reply-To; b=Rk9MoIYOnZCkbZjDRVy/8myz3wvRJv2rBDNOsXtA612Z4jqIhpXHtV3Dg7o6JEAM/XH8B7t1bOkJ/TQ6//lGjUeHkJAo5iJF/Y1UsZZOkz4N9ArpX6R2RjTqUoOb5IyB2ZRxxks5KeS9bBhFmF8TndnQA0/gnKP/rCj1TQ5q7XIiqiZISeK/9timkDJfbfylAE8Z1V/4oe7bk1qBkP/Wc3KxR6/87wyIwuJPnCPf3Vukq8D5eFZJEQ5wAAtCWD2MOJzT1FbKBrW+PGazmoqMmv/9nAswW5qtB32K9ZuAzA/7JG0Ia4w15R4IseKl4fd8p14p/p8/O9JEIs1ND0H/hw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1623190198; bh=4NM090f+WQe3sE2SSqErar22NjiI0mHi3qrFZ325V/R=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=pOPR+UF49wEwbSKMQvfoQTdemStVnEqaBR1YxI3bjovJ4fxxMRi3+r0VuWw29VNqhE6qnk3WXNZCkGRAMnQz0cXBzp2dUfdoXzdOz+8U6fWolf0uIfYPOLLkHFvfb+JiVPP+jr/oed6UDJ5BG+a/D3jrdTwQU6l7yuMmd7fDib8MFzqLCxheve7DR6UtZoR2KVxoDUvMGn+Z4d836DUb3apuKIpSRYZMU+mjPZGT0g8IVVr0tT8iOQCAQg7VnCnl6Mj8BVQNh7lPyKSwcfg57KaB4Ufr0ufPPA+9bkrWxEq46GErz3AoJl5M0T2VThlaD7TPevR8cBcDmyDI4k/j4A== X-YMail-OSG: 0WMxzcoVM1k5QGqnBdk1P36nZlbi9gSGZxhkJg0IpFI4kSI3azKEPanwOtV_LYg CpJ56J0IkiQ6eL0HSMT2.BKGgAA2bjf0j1J6OUYajLLXxnXg6BFETAzNZWxj8Emh6SmLsrWJz6aF FiFKi8Cb89L5ZnGoTNDH_n227C7gScrgldLY9whPtxFzV_EePT7q1E.zjXSUStOQrGXXN5ahVtjn Dhg9wWEu2uZI3pH1QEjKAb.nYUC_t0k.rYr6cEBdS6L6b2ct7gPHk3mauxQ7XbZ69uqc3sCANENd iAsQeU8OBy00eSoDIrM3qrQQ3racJMjW77DkMvts9_q1eMWvOvxEA2ESu4AZjqduEJZ2FiJjy3jc UHOidiQFZsae5oc1kvwYZNCryV.rktDYdwEUoRZlnms51M0iFrOZI_dgtkHW94Bvq7aR7npz.HSP i8Yd0F10csYb3Qerv8wJD6HZjzwg8UwAwuY03Ryl2x_2WqXTi7QA4Zfc2JHl4CNqeE5yFLB5vHiC hEqrFZ6HJY9CF3VKSATIkDZpllRu.keZNJrcIQBDVLcvrFFrQpQyQ0_IkwcONMQrSUTBBqNgM.tB lR5XSa1UVUlxoUO1pnAANSl94fpZ_lk2ABCw1m43xvuEwIhF1Coa8dlvOa1z6EBgKMaLafiYxGIi Hp9B.BgIUYUXxlyEqMQM0RcJ278DiJmGDn1tq4AHr9Ra8ACi5E6IaJY7TWQm8iszl7don7XZl8ga opdV31EZcmcza5STJNqPUes0q8UskWfQ.dFZ5QU50Xid0EjlPua4R9Nyz0NEhNM1V7zKuJwJwyJB _mlRwQ0.tSVnxKrtngNun7JSJoR7cHd.IFi7zI8ITM1XhrqWEZmMwk5R43NTScRm4awOlicT3FG0 SXnmmb58A_Jd9hEx056MwRLeSVQTO_XGpNQeQVjqy6_IQesexICsAIwFziQ3TBcfRo4w6FGGNG.R c1RcTzn49oz.LvBvuQ68JmUSzK8rb9_B_FcO8_l9q9gs47988ZRdTIqbupNobsKMti3ZTq1PklHz Nk8saagF6IM8ERj2gelNmhusaHKMX7e16KK11BoGPWYpZeKUdWgsFtSG_BeTlnFIW4X80h5dHtbk K7F.POpUyNNvCOqmGATz0SzT0MiUTceWLns3QpBFqQgqgU_h3HFKr6nJ9CzHqVbFstm28awwIJmG g4SKaBEjrdTCaI2Wr86JwUAbTnkTX0VKlsXVXDqqVIOlBJ3skrt6D4safvHLPCcJNXxR3SGJiXxE r_58qsl.QKYmzt.WcHew0cuRlFk3J8oZiKWMpHLbQaSN3fwEF7mUyDZPr5q74f6.W6K0531YTKQQ s1pAJJaVqLWVMZ2RZ0Hy4i3TDgL8bjdYGcg1FBz6bVdxxoyjmGNOKfLdPmBNnU2tbhXgkZ_sn6WQ 1jeU1zVu2IIgk8qNOILeo4.x6E_h2WWTF6cW2JZ6J46MX0wYckKC3eqGR3hIrPkO0bnYZmx.WDDA ZmF4Ha0GAmooLXoyF7WEfJ7dFd9vmzcAQe7qGH4zvKZ2XWM4gqZcuiKfd6aejHmiH0do1fN_hleO yvX4k5OEXenD_m2srqOmOHc4GTH8bqLLFVoudCViDsigHTFmSMt65PS9rC6k8KSGWtgwS9FyklaP CzQwfBHgQBmRo2awD8sW_pg8jdpVNlO31YV3RziNlLCSkwRE4TQ3svLVjSJEjcnsl4jI5avzL_p3 55cO_fhQ3wClpFoixHTHdv8Lgiu.QpX8569EEJqnzVK6gNSrh9t0p4ngreek9qVQUSXqhJ.jOY.9 DRwxect7ildTcG4jIBR8GbkT.9qYwEH_tq.y564X2GR_0sr3n_J1E_CTSrpeWNyn03YSbWhxLID0 6p8YoqXQxzCpXIcRHDi_jDIg0HRNoVWTfSMdYfqBhK5WtEPANdt.3221tXKaQ6jW.Uf.mQ1qQNi8 yHoCoX6CQtjTk.ARSIngLxygJlCVyqhcAno1Rm5957jvcbvyYXkyych0cIWG7aw.8Exno1G1lu.h GJuG_bgMadsuz7y_RIFDH82jFEn.WSD4DEPCeYrA8_oody4PzAQ2R.hw3eeXtjsibegmpP7NBJK2 aBEeJWxfly3gJL4TybUfcchVPDV3opkABWVykY3HyzfznE2plf0iNIj5Go7f1buRjFW5_HM9FQYi tcf6eE5JoeQUNMddLvKTsd6.VxypA9_U8b09fJt2BHbJn0CWeZvutG9h3_Taw4XTONck6Fxh8cAi lbrCE6CXnsWDZN3Cae26nWZ0A_Pcr7.lXWsiz2uKCH.vReb.DswhRdSr4nMCEMLk0qKaGu7C4hZY XZE.aWMTzFaOTUNTzGSUW1GXTEXsE0pQcsty6YjNI3UXgM_SFXcgiHhw043dsNr0Ljlwlckg4b5L N8OmNuYHlmnEI9VWXUgpK.Z4rbeBLDGOantffuCBaNV9M5K5G3fGOX1AuOIugaqVSxHy_.1ufE5f 9fav_ZhU0QMv2pT2hJb79X0QBWrvPiRzKiuxP3Ps7w.NOn__NYhLi5vLtd1P0Y9RNZsWmAUZfLJl Zxi28uV9vhRoARFIbsI5pSkLSoGAizSAZ8XzNNXixeRAzTZjGRzfMuOcmudGiQdRtih4fPr5i0eo N_N5jTsG5bHijYjo6S1N3pm3u6DhY3u5NUiljhIAZtOmZ28ck6.mgyO61I1ynklAYO3TkMxvimPj HiIIQXJNrVaZ7CKttVWzmhqd7mAtFHrDkzjsZi0g- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic302.consmr.mail.gq1.yahoo.com with HTTP; Tue, 8 Jun 2021 22:09:58 +0000 Received: by kubenode548.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID f3ad74d6ed73ab097f4220e2a5120456; Tue, 08 Jun 2021 22:09:56 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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 (Mac OS X Mail 14.0 \(3654.100.0.2.22\)) Subject: Re: OpenZFS imports, status update Message-Id: <94FF271E-1397-42C5-8A9C-26E423D72701@yahoo.com> Date: Tue, 8 Jun 2021 15:09:54 -0700 Cc: freebsd-git , freebsd-current , FreeBSD-STABLE Mailing List To: Li-Wen Hsu X-Mailer: Apple Mail (2.3654.100.0.2.22) References: <94FF271E-1397-42C5-8A9C-26E423D72701.ref@yahoo.com> X-Rspamd-Queue-Id: 4G04D75RKmz4tCp X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=Rk9MoIYO; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.68.148 as permitted sender) smtp.mailfrom=marklmi@yahoo.com X-Spamd-Result: default: False [-3.50 / 15.00]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.68.148:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.68.148:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.68.148:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.68.148:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-current] Reply-To: marklmi@yahoo.com From: Mark Millard via freebsd-git X-Original-From: Mark Millard X-ThisMailContainsUnwantedMimeParts: N 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`: >=20 > error: cannot lock ref > 'refs/remotes/freebsd/vendor/openzfs/legacy': > 'refs/remotes/freebsd/vendor/openzfs' exists; cannot create > 'refs/remotes/freebsd/vendor/openzfs/legacy' >=20 > The solution is update the upstream of the tracking branch: >=20 > (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. =46rom 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 =46rom 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. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)