Ports tree have been migrated to git

[Kurt Jaeger]

Hi!

> On 1 May 2021, at 22:08, Kurt Jaeger <pi at freebsd.org> wrote:
> ...
> > I just want to be back in the state where git show does not show
> > any changes 8-}
> 
> git checkout origin/main
> git branch -d main  (you might have to use -D here if it doesn't want to get rid of the branch)
> git checkout main
> 
> And voila.

# git checkout origin/main
error: The following untracked working tree files would be overwritten by checkout:
        multimedia/transcode/files/patch-import_demux__pass.c
        multimedia/transcode/files/patch-import_extract__ac3.c
        multimedia/transcode/files/patch-import_extract__mp3.c
        multimedia/transcode/files/patch-import_extract__pcm.c
[...]
Please move or remove them before you switch branches.
[...]

Ok, I deleted those, but then 

git show

shows me details of

commit 7e1519526b60a1437ac59ecabc24fe7ff30fe127 (HEAD -> main, origin/main, origin/HEAD)

I then tried the next step:

$ git branch -d main
error: Cannot delete branch 'main' checked out at '/pou/ports/default'
$ git branch -D main
error: Cannot delete branch 'main' checked out at '/pou/ports/default'

It is really confusing, sorry.

-- 
pi at FreeBSD.org         +49 171 3101372                  Now what ?