From nobody Tue Jun 08 23:02:15 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 B71E07ECEB5 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 4G05Ng65NKz3N6Q 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 p17so33948908lfc.6 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=FuYJq8fJVOuorWoj5Yc+oqoZvU/LS/CL/M/5nvLreOHP/LIgh9jTQVZW70jRJItZ24 9ySudvQbydB3S/XTF63Pi0sqri5Ncx47+xwvF4hqm8QHZ5zwWDH5X+MMr84VMi1ahO0e V4MUDDq3ZCwy8N0Am64X9b+BqGitNPXK0gfjnENDk0BVfgUpkSo8JrE0i1RjqHepjS2h OipQDEym7zUqQUdl6yaQiadl4nEbo1eksgCqevYFXnji7wugiLPsvWDb2p+1T1z8MjUN Kf7CiwfFVvEcukKNF8UNsWTC/jGzywhhF+7ULurarC/mpiMJQWrMdF+j2sxfTWY9VDDW U2Bg== X-Gm-Message-State: AOAM530L6kmURatGH5sIFtsngPA/H/fsVu0S1C1RMrkX0AWKtLXSW5vA 2YuMy0dev/0CrzLOiV7JLmfnJDdXUO3pGGybCTtxeQ== 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: 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: 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: 4G05Ng65NKz3N6Q 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-current@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-current] 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--