Date: Sat, 28 Nov 2020 13:40:45 +0000 From: Rene Ladan <rene@freebsd.org> To: Dimitry Andric <dim@freebsd.org> Cc: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128134045.GA35756@freefall.freebsd.org> In-Reply-To: <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote: > 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 > Yes, I was a bit too fast noticing myself ;) René
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201128134045.GA35756>