PHP-8.1 branch seems broken

2 years ago by Remi Collet — view source

unread

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

2 years ago by Patrick ALLAERT — view source

unread

Le lun. 4 juil. 2022 à 10:16, Remi Collet remi@php.net 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

--

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

2 years ago by Sebastian Bergmann — view source

unread

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."

2 years ago by Ilija Tovilo — view source

unread

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

2 years ago by Christoph M. Becker — view source

unread

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 ?

Derick is working on fixing the issue. Since he will need to reset to
the last good state, and force-push, everybody will have to fix their
clones afterwards (reset and pull). Please do not push to any branch
until this is done.

Thanks,
Christoph

2 years ago by Derick Rethans — view source

unread

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 ?

Derick is working on fixing the issue. Since he will need to reset to
the last good state, and force-push, everybody will have to fix their
clones afterwards (reset and pull). Please do not push to any branch
until this is done.

Thanks to Tim we've rebuild the PHP-8.1 branch. You will only have to
reset the PHP-8.1 branch, with the following:

git fetch
git checkout PHP-8.1
# Backup local changes
git reset --hard origin/PHP-8.1
# Reapply local changes

Before you push anything, please make sure that the graph looks good,
preferably by using the "gitk" tool to visualise.

cheers,
Derick