Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:118173
MIME-Version: 1.0
References: <f9ce69e2-88cb-12f3-74a6-a6ed753555cf@php.net> <CACwt+Je36G0hcFQEGvsYPCvQ=NxL2v3RYDDoCnpY4g+ErcacwQ@mail.gmail.com>
In-Reply-To: <CACwt+Je36G0hcFQEGvsYPCvQ=NxL2v3RYDDoCnpY4g+ErcacwQ@mail.gmail.com>
Date: Mon, 4 Jul 2022 11:08:20 +0200
Message-ID: <CAPyj-LC+u9jPjPOeMVEO0ZkhGsnNT-crw+qbzmV0RBqiwtnMsw@mail.gmail.com>
To: PHP internals <internals@lists.php.net>
Content-Type: text/plain; charset="UTF-8"
Subject: Re: [PHP-DEV] PHP-8.1 branch seems broken
From: tovilo.ilija@gmail.com (Ilija Tovilo)

> > In PHP 8.1:
> >
> > This branch is 1 commit ahead, 7 commits behind master.
> >
> >
> > This seems terribly wrong, looks like was merged from master
> > (NEWS file have 8.2 entries)
> >
> >
> > Can some GIT expert check and fix that ?
>
> I guess that the "1 commit ahead" is just that your local branch is a merge
> with master.
> AFAICT, this has not been pushed.
>
> What about:
> $ git brand -D PHP-8.1
> $ git fetch
> $ git checkout PHP-8.1
>
> For a fresh start?

It looks broken on GitHub too. I think
ac6edbb73e701f6132b56065ff9343869feb4461 was accidentally pushed to
PHP-8.1 instead of master. PHP-8.1 should be reset to
110573726b6917580cd2c0c5d89c83e72f2de686.

I can try, but I'm not sure I have the permission to force-push.

Ilija