Date: Sat, 1 May 2021 22:30:24 +0200 From: Kurt Jaeger <pi@freebsd.org> To: Dimitry Andric <dim@freebsd.org> Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: <YI26YFiue7%2BjCcgc@fc.opsec.eu> In-Reply-To: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> References: <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA%2B4mkQ@mail.gmail.com> <YI2rkuT2W2bpPCpR@fc.opsec.eu> <CANCZdfpGx9SnSVPOBt0e5SOT0rzQbeOd%2BSZeMKTWkrXWZS3KMw@mail.gmail.com> <YI21Uht4hkDHwvvF@fc.opsec.eu> <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi!
> On 1 May 2021, at 22:08, Kurt Jaeger <pi@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@FreeBSD.org +49 171 3101372 Now what ?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?YI26YFiue7%2BjCcgc>