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--