Date: Sat, 28 Nov 2020 12:44:49 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: Rene Ladan <rene@freebsd.org> Cc: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> In-Reply-To: <20201128113854.GA12390@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 28 Nov 2020, at 12:38, Rene Ladan <rene@freebsd.org> wrote: > > I just noticed that after doing a 'git pull' that the ports repository > at cgit-beta seems to have diverged: > > rene@e17:/usr/freebsd/cgit-beta/ports % git status > On branch main > Your branch and 'origin/main' have diverged, > and have 546213 and 528036 different commits each, respectively. > (use "git pull" to merge the remote branch into yours) > > It took 5.85 seconds to compute the branch ahead/behind values. > You can use '--no-ahead-behind' to avoid this. > > nothing to commit, working tree clean > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > fatal: refusing to merge unrelated histories > rene@e17:/usr/freebsd/cgit-beta/ports % > > and what happened to those 18000 commits? I think you just missed Ulrich's heads-up mail :-) https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html -Dimitry --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCX8I4MQAKCRCwXqMKLiCW ozMDAJ49+xbIGbST+Bf7o7qghMmrVcJN+QCg0Ua8JqDwIvvM3iPv9IZYdreVMOQ= =X3xA -----END PGP SIGNATURE----- --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3>