Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:118171
Return-Path: <patrick.allaert@gmail.com>
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 12968 invoked from network); 4 Jul 2022 07:12:18 -0000
Received: from unknown (HELO php-smtp4.php.net) (45.112.84.5)
  by pb1.pair.com with SMTP; 4 Jul 2022 07:12:18 -0000
Received: from php-smtp4.php.net (localhost [127.0.0.1])
	by php-smtp4.php.net (Postfix) with ESMTP id 067D71804BD
	for <internals@lists.php.net>; Mon,  4 Jul 2022 02:04:46 -0700 (PDT)
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on php-smtp4.php.net
X-Spam-Level: 
X-Spam-Status: No, score=0.5 required=5.0 tests=BAYES_20,
	FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,
	HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no
	autolearn_force=no version=3.4.2
X-Spam-ASN: AS15169 209.85.128.0/17
X-Spam-Virus: No
X-Envelope-From: <patrick.allaert@gmail.com>
Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256)
	(No client certificate requested)
	by php-smtp4.php.net (Postfix) with ESMTPS
	for <internals@lists.php.net>; Mon,  4 Jul 2022 02:04:42 -0700 (PDT)
Received: by mail-pl1-f170.google.com with SMTP id 5so2143804plk.9
        for <internals@lists.php.net>; Mon, 04 Jul 2022 02:04:42 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112;
        h=x-gm-message-state:mime-version:references:in-reply-to:from:date
         :message-id:subject:to:cc;
        bh=lWi+IRQKhGhu0eqHKAlDNqmID01TPI+k654/+oXb31Y=;
        b=nR8IXR2W2Vh+kQzYriWFghApLj5axKZI9jouwwbrrWyvLqZ8IdBphknKlAzbGGdnJG
         YYSDqyK8VmNqOiUbuqMETRzt2jYDmD/K0eplXGfa0BW1bwduv+0QhPi1D8AtKK03YzTV
         3Urp2/IddEVJxjMJYpRc9Vt7UwQzarRU+USrqH4x3tl6kj8hYQpdETjihRiibmuAVFyX
         CHvqoSQcMEbvoMWUboQvizFeLTtwQKvrBfxU2HIOQOIjwZ6AxfCOkJagvwLiL5nNCUNG
         muHGE/sszNqBa4Tg7J2+EnV9bpo/av7MFGF/H2h7agfJwWXnBkWEyosjE3SNWLLbUxU3
         Q4PQ==
X-Gm-Message-State: AJIora9F25KJoI5cewmg93Q19OKjqktDWUqd8Ca85q/CzX99hZ74Sezv
	E15StLmH4F2eOiK7GX2gxZfnbYE1R9pvbM4g/ZdBV6z5gQ==
X-Google-Smtp-Source: AGRyM1ul373Evj86z5D2vCRzlwZQOB3pQwyC89XYUTo8078fmn1UlQwmSAyU1U4DiV54L2CSq3VN0uESi1s2nKR9ZvM=
X-Received: by 2002:a17:902:ce83:b0:16a:4663:f34b with SMTP id
 f3-20020a170902ce8300b0016a4663f34bmr34765358plg.125.1656925481382; Mon, 04
 Jul 2022 02:04:41 -0700 (PDT)
MIME-Version: 1.0
References: <f9ce69e2-88cb-12f3-74a6-a6ed753555cf@php.net>
In-Reply-To: <f9ce69e2-88cb-12f3-74a6-a6ed753555cf@php.net>
Date: Mon, 4 Jul 2022 11:04:30 +0200
Message-ID: <CACwt+Je36G0hcFQEGvsYPCvQ=NxL2v3RYDDoCnpY4g+ErcacwQ@mail.gmail.com>
To: Remi Collet <remi@php.net>
Cc: PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary="000000000000bcb81805e2f70692"
Subject: Re: [PHP-DEV] PHP-8.1 branch seems broken
From: patrickallaert@php.net (Patrick ALLAERT)

--000000000000bcb81805e2f70692
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Le lun. 4 juil. 2022 =C3=A0 10:16, Remi Collet <remi@php.net> a =C3=A9crit =
:

> 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?

--=20
-Patrick

--000000000000bcb81805e2f70692--