Re: [PHP-DEV] PHP-8.1 branch seems broken

2022-07-04 Thread 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

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: https://www.php.net/unsub.php

Re: [PHP-DEV] PHP-8.1 branch seems broken

2022-07-04 Thread Sebastian Bergmann 

Am 04.07.2022 um 11:04 schrieb Patrick ALLAERT:

I guess that the "1 commit ahead" is just that your local branch is a merge
with master.


No. If you look at https://github.com/php/php-src/tree/PHP-8.1 right now 
then you will see "This branch is 1 commit ahead, 7 commits behind master."


--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: https://www.php.net/unsub.php

Re: [PHP-DEV] PHP-8.1 branch seems broken

2022-07-04 Thread Patrick ALLAERT 
Le lun. 4 juil. 2022 à 10:16, Remi Collet  a écrit :

> Hi,
>
> 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 ?
>
>
> Regards,
> Remi
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: https://www.php.net/unsub.php
>

Hi Remi,

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?

-- 
-Patrick

[PHP-DEV] PHP-8.1 branch seems broken

2022-07-04 Thread Remi Collet 

Hi,

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 ?


Regards,
Remi

--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: https://www.php.net/unsub.php