From nobody Mon Jul 19 17:12:27 2021 X-Original-To: freebsd-hackers@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 5412D12718F3 for ; Mon, 19 Jul 2021 17:12:31 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (troutmask.apl.washington.edu [128.95.76.21]) (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 (2048 bits) client-digest SHA256) (Client CN "troutmask", Issuer "troutmask" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GT7gy0QY6z4bbg for ; Mon, 19 Jul 2021 17:12:29 +0000 (UTC) (envelope-from sgk@troutmask.apl.washington.edu) Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.16.1/8.16.1) with ESMTPS id 16JHCRGs074924 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 19 Jul 2021 10:12:27 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.16.1/8.16.1/Submit) id 16JHCRXY074923; Mon, 19 Jul 2021 10:12:27 -0700 (PDT) (envelope-from sgk) Date: Mon, 19 Jul 2021 10:12:27 -0700 From: Steve Kargl To: Chris Torek Cc: freebsd-hackers@freebsd.org Subject: Re: git and openzfs conflict Message-ID: <20210719171227.GA74784@troutmask.apl.washington.edu> References: <20210719165200.GA74695@troutmask.apl.washington.edu> <202107191703.16JH3A8P089286@elf.torek.net> List-Id: Technical discussions relating to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-hackers List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-hackers@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202107191703.16JH3A8P089286@elf.torek.net> X-Rspamd-Queue-Id: 4GT7gy0QY6z4bbg X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=washington.edu (policy=none); spf=none (mx1.freebsd.org: domain of sgk@troutmask.apl.washington.edu has no SPF policy when checking 128.95.76.21) smtp.mailfrom=sgk@troutmask.apl.washington.edu X-Spamd-Result: default: False [-1.04 / 15.00]; MID_RHS_MATCH_FROM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[128.95.76.21:from]; DMARC_POLICY_SOFTFAIL(0.10)[washington.edu : No valid SPF, No valid DKIM,none]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-0.93)[-0.933]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(0.90)[0.896]; SPAMHAUS_ZRD(0.00)[128.95.76.21:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; R_SPF_NA(0.00)[no SPF record]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:73, ipnet:128.95.0.0/16, country:US]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-hackers]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N On Mon, Jul 19, 2021 at 10:03:10AM -0700, Chris Torek wrote: > (note, I broke up this long line myself) > > >error: cannot lock ref 'refs/remotes/freebsd/vendor/openzfs/legacy': > >'refs/remotes/freebsd/vendor/openzfs' exists; > >cannot create 'refs/remotes/freebsd/vendor/openzfs/legacy' > > This is a classic directory/file conflict. There was, earlier, > a file named foo/bar. Now there's a directory foo/bar containing > a file named baz. You have to move the foo/bar file out of the > way, or remove it. > > In this case, it's a "ref": a Git thingy that holds a hash ID. > If you're not using it yourself, it's safe to just remove it: > > git update-ref -d refs/remotes/freebsd/vendor/openzfs > > Repeat for each "refs/remotes" issue as needed. > Thanks, Chris. I'm not using any local branches; nor do I use ZFS. I'm simply tracking the FreeBSD git repository. The only local files/changes are a custom kernel config file and a number of bug fixes/additions to libm. -- Steve