From nobody Mon Jun 7 22:29:51 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 1E08514CFE84 for ; Mon, 7 Jun 2021 22:30:03 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4FzSjl0968z4hpt; Mon, 7 Jun 2021 22:30:03 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f170.google.com (mail-yb1-f170.google.com [209.85.219.170]) (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 DD1A67F2; Mon, 7 Jun 2021 22:30:02 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f170.google.com with SMTP id m9so20818247ybo.5; Mon, 07 Jun 2021 15:30:02 -0700 (PDT) X-Gm-Message-State: AOAM532q2XX3ZOPfdQUPKjypmP0MwlhPyjGMvMWF0qMMvJmICj6rx4ZD wMv9XtOkpoCmcDvie7L2NEEJThyDL1bQEzPvxg4= X-Google-Smtp-Source: ABdhPJz+OAfeBqldNx67Ps+XHLvt+UrQcm9jhVuTlnKpErDVELTAYkP6cwmc5TOuF1mUbvEURrOQDhzC9cF49KiIIOI= X-Received: by 2002:a25:8191:: with SMTP id p17mr27325125ybk.405.1623105002446; Mon, 07 Jun 2021 15:30:02 -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 06:29:51 +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" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N After some discussion and experiments. Following are the current status and the planned route: Currently the staging git repository has been updated: https://cgit-dev.freebsd.org/src/ See the merge commits in main and stable/13 branches, and now we have three branches under vendor/openzfs/: - vendor/openzfs/master (imported from upstream openzfs/master, will be merged to main) - vendor/openzfs/zfs-2.1-release (imported from upstream openzfs/zfs-2.1-release, will be merged to stabe/13) - vendor/openzfs/legacy (renamed from the old vendor/openzfs) To Ulrich: the plan is importing openzfs branches as-is (same hash values) to the vendor/openzfs so the history of the old vendor/openzfs can not be shared. We have modified the commit hooks to: 1. Allow vendor/openzfs/* branches import commits from committer with address not @FreeBSD.org 2. Allow merge from vendor/openzfs/zfs-2.1-release to stable/13 3. The commit mail generated for the vendor branch will be "one mail per push", not having the complete diff but a list of commits' short hash and subject line. 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 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 will send an announcement for this operation and migration tip to -git and other related lists. Please let me know if there is anything I missed. If it sounds good, I will deploy the configurations and hooks to the production git repository and let Martin be able to import the new OpenZFS codes soon. Best, Li-wen On Sat, Apr 24, 2021 at 4:24 AM Ulrich Sp=C3=B6rlein wrot= e: > > Wouldn't vendor/openzfs/master simply be an alias for openzfs/master and > it would be the pristine upstream source repo? Or do we have local > modifications in our vendor/openzfs/master, if so, ignore me. > > On Fri, 2021-04-23 at 02:50:57 +0200, Martin Matuska wrote: > >Hi Warner, > > > >thank you very much for the update. > > > >If I understand this correctly, the way to go in the future is a 1:1 > >merge from openzfs/master to e.g. vendor/openzfs/master and from > >openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a > >second step a subtree merge from vendor/openzfs/* to main or stable/13? > > > >Martin > > > >On 22. 4. 2021 20:34, Warner Losh wrote: > >> Hey Martin, > >> > >> I just wanted to let you know we've been working towards enabling > >> pushing vendor/openzfs/* branches. There's one big issue that needs to > >> be corrected. Currently, we'll do one email per revision hash on such > >> imports, so openzfs would generate ~10k emails, which would be > >> undesirable. Li Wen is working on enabling one email per push for > >> vendor/* which would eliminate this problem. We hope to be doing test > >> pushes to the testing repo early next week, and if all goes well > >> enabling this in production shortly after. > >> > >> IMHO, you've made a compelling case: the size is small, the coupling > >> between the projects is tight and we get some extra benefit from > >> having a finer-grained vendor branch that we import from. The plan to > >> import directly from vendor/openzfs/zfs-2.1 would normally be > >> concerning because it's not following the usual main -> stable/X > >> workflow. In this case, though, since upstream follows that workflow > >> we won't lose things that get pushed to stable/13 that aren't also > >> relevant to main. There's at least some configuration needed to allow > >> the merge commits to stable/13, but we're still working out the last > >> details. > >> > >> So we'll be good to go soon (1-2 weeks until you can land commits, I > >> think). Does that work for you? > >> > >> Warner > >> > > > >_______________________________________________ > >freebsd-git@freebsd.org mailing list > >https://lists.freebsd.org/mailman/listinfo/freebsd-git > >To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" From nobody Tue Jun 8 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 From nobody Tue Jun 8 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 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 From: Li-Wen Hsu Date: Tue, 8 Jun 2021 19:45:04 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: [HEADS UP] Rename of the vendor/openzfs branch To: freebsd-git Cc: freebsd-current 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 From nobody Tue Jun 8 13:21:28 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 77D8E7C9856; Tue, 8 Jun 2021 13:21:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4FzrVX316vz4nhy; Tue, 8 Jun 2021 13:21:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) (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 4FE3485BE; Tue, 8 Jun 2021 13:21:40 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f174.google.com with SMTP id e10so30139750ybb.7; Tue, 08 Jun 2021 06:21:40 -0700 (PDT) X-Gm-Message-State: AOAM531W7r6Deb6E/3HxZ0C/qJ90V8eKzR8LIn1Uylj4ZVOOWXr6j86X UFDjXJ5FY5SB933YLQ9Tc6k6cZxRpmPsRgPa+6U= X-Google-Smtp-Source: ABdhPJwWTCWIsCiIgsoofg+fqywPbywov31rA3smpCVgchnInmtv1TKDcBIud4Kt+dO/XNe2/lvrrnZfdHk4wmItzY8= X-Received: by 2002:a25:c78a:: with SMTP id w132mr11970630ybe.127.1623158499955; Tue, 08 Jun 2021 06:21:39 -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 21:21:28 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [HEADS UP] Rename of the vendor/openzfs branch To: freebsd-git Cc: freebsd-current Content-Type: text/plain; charset="UTF-8" X-ThisMailContainsUnwantedMimeParts: N On Tue, Jun 8, 2021 at 7:45 PM Li-Wen Hsu wrote: > > 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 The renaming has been done: https://cgit.freebsd.org/src/log/?h=vendor/openzfs/legacy If you have a local branch tracking vendor/openzfs, please refer to the previous mail for migration. https://lists.freebsd.org/archives/freebsd-git/2021-June/000015.html Best, Li-Wen From nobody Tue Jun 8 22:09:54 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 1F37A7CC056 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 4G04D75RN0z4tG2 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: 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 (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: 4G04D75RN0z4tG2 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-git] 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) From nobody Tue Jun 8 22:52:43 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 7AC0A7EAD43 for ; Tue, 8 Jun 2021 22:52:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (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 4G059g2h6Zz3K9W for ; Tue, 8 Jun 2021 22:52:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-lf1-x12f.google.com with SMTP id v22so33356972lfa.3 for ; Tue, 08 Jun 2021 15:52:55 -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=f+Mr+VJAwzl7YPU0ghVA/U3fkP+k6VRlwA9noU4EaY//oPb1XM2w437OsPW9RPEBLj 46yOKiQUWr2Tcac8FJOIgYf0nrsKEpeBsUtgMPP5hSRR8oUTNCQhCRx4RaIutQGJYiQz MExHhQpMWrtBjfP6y3eKCWcY+DHlDi/EFi+yCU4gl+fx00Af/DUvmwn1lZ6BUlRxqneF 5Gw4BCGOOXhAAAYpOtCjY67PalbHLVj0jjs0a43YPJxlLWhY25Tat98PdmIWc88p8o3D U7R4MMzOaYAvIkXlPtD+vK29jdws5HdOyX30YzFr55bp9HinHTpoz2mtwG8+kLziZq4z Phaw== X-Gm-Message-State: AOAM533xl+Hq8YoBcVe1MYf2/T2d8kknS5bdZAByn+fohNcMw7/yOlJB a/4ZxiGJnWMOb3qrbXw7KXD4JL5Rx2XTM4g+j27u6A== 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: 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: <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: 4G059g2h6Zz3K9W 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-- From nobody Tue Jun 8 23:02:15 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 B72027ED34B for ; Tue, 8 Jun 2021 23:02:28 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) (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 4G05Ng65Qhz3N1J for ; Tue, 8 Jun 2021 23:02:27 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-lf1-x131.google.com with SMTP id t7so27632128lff.0 for ; Tue, 08 Jun 2021 16:02:27 -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=swr9tCtNpFKGguoSi4WNQs2i9/brwG6AHkDLhkChnjI=; b=zZ/s29WvK28UwnfKBIVn1sOrrySEB5lquBMQmvVJIXB+tSebAf1ROC8Ve1iVLrwvGz aJ/3Bqz2FxXdu0MQXHTWMPrDQx4ZT4Ae0hsgZ/5z8X9KBOYBSlIxUoEkWDet45CND3nD zst2R8GtgYlP8PtIldEtFX2lR6ER8i9cQLZdad4hP62uiRvicUddQm9CWxBiYE2Sc5gH hsonfAYvvVdNyfBRfSqhVnlJoUv6PkvTfQJgM+hTedJwyVqVu4zdX1zjagNb0ot44rzK Te9/h6Cj8M6hB5c1Ses4JFT7zwwvULtyy/e2uJXnQulgMRCCPfCmBryiicDUIktZ72OE ug/g== 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=swr9tCtNpFKGguoSi4WNQs2i9/brwG6AHkDLhkChnjI=; b=aEDJINJxJgaOSjid1HKStaD9zI/DeOtTUmf4Z/nzMpcBZPL53zYcgzoE/RjNpcVSRI dX+Avdjo3tcqYJU9bZFQf0xgmo43Ep9zwtDIqSkI7zpM7gscUGiQRtOMpac8csGD+odP dSrATX+aBKnVou2BosxxCHfPenscDDk81fcNtPINnz6sebkcWdikHYcPWaDLg0nePdQn qQTEXuDjORhYhVKvUWZrNDiRc5r4yFCokzc9bWYy85X/SF9irm/NsIW1PYc5dc+AKo07 ImfIdXFtE2Dj2sTNwX0dPdT8GdEfqBxDL/lJ0q/VjRZICx+L7JU9ed/RcayV2WJ5JOdk VMRg== X-Gm-Message-State: AOAM5315TMXRZOkKdB2mTEjxJJGAWRiabl8U0+Gk0o4LPbiP5PZNc45V 5VioOQrPei1K5CWrpFUWaLgL9orD/tS3+o5c18DjlQ== X-Google-Smtp-Source: ABdhPJz9qWSFB2lRUvMIxmztOHdFnJTgxqmZN/4eANXTCLIDjAN7bZrR1/CcU3xZGJqGZGlIK56KExFXBU+WKT0/aNw= X-Received: by 2002:a05:6512:2249:: with SMTP id i9mr17494592lfu.592.1623193346383; Tue, 08 Jun 2021 16:02:26 -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: <94FF271E-1397-42C5-8A9C-26E423D72701.ref@yahoo.com> <94FF271E-1397-42C5-8A9C-26E423D72701@yahoo.com> In-Reply-To: From: Warner Losh Date: Tue, 8 Jun 2021 17:02:15 -0600 Message-ID: Subject: Re: OpenZFS imports, status update To: Michael Tuexen Cc: Mark Millard , Li-Wen Hsu , freebsd-git , freebsd-current , FreeBSD-STABLE Mailing List Content-Type: multipart/alternative; boundary="000000000000d03b2605c44926e6" X-Rspamd-Queue-Id: 4G05Ng65Qhz3N1J X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=zZ/s29Wv; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2a00:1450:4864:20::131) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; FREEMAIL_CC(0.00)[yahoo.com,freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[6]; SPAMHAUS_ZRD(0.00)[2a00:1450:4864:20::131:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-0.998]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::131:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2a00:1450:4864:20::131:from]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git] X-ThisMailContainsUnwantedMimeParts: Y --000000000000d03b2605c44926e6 Content-Type: text/plain; charset="UTF-8" On Tue, Jun 8, 2021 at 4:58 PM Michael Tuexen < michael.tuexen@macmic.franken.de> wrote: > > On 9. Jun 2021, at 00:52, Warner Losh wrote: > > > > 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. > Do you mean 'git remote prune freebsd'? > Yes. Should have cut and paste instead of retyping it :( Warner > Best regards > Michael > > > > 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) > >> > >> > >> > > --000000000000d03b2605c44926e6-- From nobody Thu Jun 10 20:13:19 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 C99137E84FC for ; Thu, 10 Jun 2021 20:13:23 +0000 (UTC) (envelope-from bapt@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 4G1FXg5NkJz4XfL; Thu, 10 Jun 2021 20:13:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 881CD2353; Thu, 10 Jun 2021 20:13:23 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [127.0.0.1] (10.246.39.62.rev.sfr.net [62.39.246.10]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 508BF4F2D3; Thu, 10 Jun 2021 22:13:21 +0200 (CEST) Date: Thu, 10 Jun 2021 20:13:19 +0000 (UTC) From: Baptiste Daroussin To: Li-Wen Hsu Cc: freebsd-git Message-ID: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> In-Reply-To: References: Subject: Re: [HEADS UP] Rename of the vendor/openzfs branch 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Correlation-ID: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> X-ThisMailContainsUnwantedMimeParts: N 8 juin 2021 13:47:04 Li-Wen Hsu : > Hello, > > As mentioned in the "OpenZFS imports, status update": > > =C2=A0=C2=A0=C2=A0 https://lists.freebsd.org/archives/freebsd-git/2021-Ju= ne/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`: > > =C2=A0=C2=A0=C2=A0 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: > > =C2=A0=C2=A0=C2=A0 (change "freebsd" to "origin" if you use the default r= emote name) > =C2=A0=C2=A0=C2=A0 git remote prune freebsd > =C2=A0=C2=A0=C2=A0 (on your tracking branch) > =C2=A0=C2=A0=C2=A0 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: > > =C2=A0=C2=A0=C2=A0 git update-ref -d refs/remotes/freebsd/vendor/openzfs > =C2=A0=C2=A0=C2=A0 (also, change "freebsd" to "origin" if you use the def= ault 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 For your information this broke gitlab mirroring... I don t when I can have= the ability to fix Bapt From nobody Thu Jun 10 21:19:58 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 126BF7ECE97 for ; Thu, 10 Jun 2021 21:20:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72c.google.com (mail-qk1-x72c.google.com [IPv6:2607:f8b0:4864:20::72c]) (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 4G1H1j70qLz4cy1 for ; Thu, 10 Jun 2021 21:20:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72c.google.com with SMTP id k11so27270232qkk.1 for ; Thu, 10 Jun 2021 14:20:09 -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=Y0/PVUgmwgUzFbZsT40Uaaa5vxHaymFwei6hczqjIys=; b=DdmvO1ah+ST+hSP9FsyclNU8lltL2KxB5UDkfnr6bR3QGRmKojuBFa2CS+phFDXvtf AiuKvHXwuVPMRkH3GcW8UTaJCQfJiVI8wuIRBQvN4M+U9DNyo2hFM9UPISLTubxzj8Dd 7FE/Mfy2cZ6t+5L2WSnwzZtE5Os7YyFP+tLszS4HPcm8upyqly03S8kW5Rvkz79XJeyM 9Bb6nwDIC/7TCk6BiwTIzx7Z+R+Z4R1wBxehoYWE95AJb7u5Zi2y1yGDexfDVYfHvU/m ByxLNNwaxY5kzy5KhD2cJ0zOlCC8xf3sr/2tdJvBjggp0mPzbIZbS7axQkuaEYEfsm8l uvxQ== 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=Y0/PVUgmwgUzFbZsT40Uaaa5vxHaymFwei6hczqjIys=; b=uPIr+CFFgKOfb4pbLnA7z9DggcF1lPBslsGXkTIOL8s7Lcmojlsh5ZCo7omYD7NT4N mc8JvAp2+/dIqOMz7SagoUWOgKp9rhxbfqist1qxXQMjKTNLLhBXs3kZA/tWQScHDkni ToKn29by5iApkds8afaxOMb9NG31PbkJc/PTpfq2g04RB36A1Op9h5lHP/l4eoOO/gEw 7iSxGeB5O2ySmYOCa2i9XqaFAnMz16PDhx+9pllXLpHl/qMwTFhmXly8o77/g1ns78LV XAJaNq2Fz2iT0rz0GOZm/rgbFl1EaQfBeiYfjMIzCIaLwk+smM8GpJILUXpDxGG3RrBM 08/A== X-Gm-Message-State: AOAM530gHBv+Ya8E4g8T9gXzkg92hIaF3Di7LPpnQNbsEC0MJb5NOC+1 hn4rWAJ7NFvgIUDhAgfbut/iazT72wCy/2R9Xhd5aA== X-Google-Smtp-Source: ABdhPJwn/qEI4r1/195/gIC3BYudnuHkA8NFMyrnhyJDk75EIikU7dsK5VJSdvjYvj+vPk+ygM8O6ZfDOa9FF9NaZlY= X-Received: by 2002:a05:620a:15a5:: with SMTP id f5mr637749qkk.89.1623360009162; Thu, 10 Jun 2021 14:20:09 -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: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> In-Reply-To: <7acba8e0-0b51-41b2-b8e7-769cc163ec10@FreeBSD.org> From: Warner Losh Date: Thu, 10 Jun 2021 15:19:58 -0600 Message-ID: Subject: Re: [HEADS UP] Rename of the vendor/openzfs branch To: Baptiste Daroussin Cc: Li-Wen Hsu , freebsd-git Content-Type: multipart/alternative; boundary="000000000000b067a205c46ff403" X-Rspamd-Queue-Id: 4G1H1j70qLz4cy1 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: Y --000000000000b067a205c46ff403 Content-Type: text/plain; charset="UTF-8" On Thu, Jun 10, 2021 at 2:13 PM Baptiste Daroussin wrote: > > 8 juin 2021 13:47:04 Li-Wen Hsu : > > > 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 > > For your information this broke gitlab mirroring... I don t when I can > have the ability to fix > Doh! Warner --000000000000b067a205c46ff403--