Re: git and openzfs conflict

From: Steve Kargl <sgk_at_troutmask.apl.washington.edu>
Date: Mon, 19 Jul 2021 10:12:27 -0700
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
Received on Mon Jul 19 2021 - 17:12:27 UTC

Original text of this message