cgit-beta ports repository diverged?
Rene Ladan
rene at freebsd.org
Sat Nov 28 13:40:45 UTC 2020
On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote:
> On 28 Nov 2020, at 12:38, Rene Ladan <rene at freebsd.org> wrote:
> >
> > I just noticed that after doing a 'git pull' that the ports repository
> > at cgit-beta seems to have diverged:
> >
> > rene at 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 at e17:/usr/freebsd/cgit-beta/ports % git fetch
> > rene at e17:/usr/freebsd/cgit-beta/ports % git pull
> > fatal: refusing to merge unrelated histories
> > rene at 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é
More information about the freebsd-git
mailing list