From owner-freebsd-git@freebsd.org  Sat May  1 20:30:28 2021
Return-Path: <owner-freebsd-git@freebsd.org>
Delivered-To: freebsd-git@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 51E3B63731F
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Sat,  1 May 2021 20:30:28 +0000 (UTC) (envelope-from pi@freebsd.org)
Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3])
 by mx1.freebsd.org (Postfix) with ESMTP id 4FXgpr1vVCz4s98
 for <freebsd-git@freebsd.org>; Sat,  1 May 2021 20:30:28 +0000 (UTC)
 (envelope-from pi@freebsd.org)
Received: by mailman.nyi.freebsd.org (Postfix)
 id 4148863731E; Sat,  1 May 2021 20:30:28 +0000 (UTC)
Delivered-To: git@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4112C6371DF
 for <git@mailman.nyi.freebsd.org>; Sat,  1 May 2021 20:30:28 +0000 (UTC)
 (envelope-from pi@freebsd.org)
Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4])
 (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 did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FXgpr1QZZz4sP3;
 Sat,  1 May 2021 20:30:27 +0000 (UTC) (envelope-from pi@freebsd.org)
Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD))
 (envelope-from <pi@freebsd.org>)
 id 1lcwFs-000A0g-Rr; Sat, 01 May 2021 22:30:24 +0200
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+jCcgc@fc.opsec.eu>
References: <CAKBkRUzXAcXfFuD74VEPG0jAQBrmkQQdqAiBMR21vX3mA+4mkQ@mail.gmail.com>
 <YI2rkuT2W2bpPCpR@fc.opsec.eu>
 <CANCZdfpGx9SnSVPOBt0e5SOT0rzQbeOd+SZeMKTWkrXWZS3KMw@mail.gmail.com>
 <YI21Uht4hkDHwvvF@fc.opsec.eu>
 <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org>
X-Rspamd-Queue-Id: 4FXgpr1QZZz4sP3
X-Spamd-Bar: ----
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [-4.00 / 15.00];
	 REPLY(-4.00)[]
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 May 2021 20:30:28 -0000

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 ?