Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:113845
MIME-Version: 1.0
References: <CAF+90c9A6zG-nYzc3NNtWGjN7y5FmwqnYzjq6GSFC5NtRsOT0w@mail.gmail.com>
 <CAN2symg2SueEONzMRndsWEhj6anXmeAQwKg+HzKh-o61bcP0Qg@mail.gmail.com>
 <CAESVnVoPEitSCzmrAR2pRY4zUp4WEBc3a1b3q4H_uh1q8ebVWw@mail.gmail.com>
 <CACXBjuirpK+Jw4W8ePib3-ZUVe0EgvcxZNeN-Za15E0g-4BwRg@mail.gmail.com>
 <CAP=4hCLU2CuDKXuJ=XgB=BAL6FARYSq0MeRJqky0GtQw891ZgQ@mail.gmail.com> <CANLbj-pbGR9a0QVjHXu+J9Z=xpJnpyjfEYGxQzwmj_NnkqBn4Q@mail.gmail.com>
In-Reply-To: <CANLbj-pbGR9a0QVjHXu+J9Z=xpJnpyjfEYGxQzwmj_NnkqBn4Q@mail.gmail.com>
Date: Mon, 29 Mar 2021 09:46:41 +0200
Message-ID: <CADK1yXKLo-0KPNnEcfsDfbp2mCK47Rt8QZ_WGK60Kqs+DrYX_w@mail.gmail.com>
To: Ayesh Karunaratne <ayesh@php.watch>
Cc: Gabriel Caruso <carusogabriel34@gmail.com>, Rasmus Lerdorf <rasmus@lerdorf.com>, 
	Sara Golemon <pollita@php.net>, Nikita Popov <nikita.ppv@gmail.com>, 
	PHP Doc Mailing List <phpdoc@lists.php.net>, PHP internals <internals@lists.php.net>, 
	Paul Crovella <paul.crovella@gmail.com>
Content-Type: multipart/alternative; boundary="000000000000bddc6605bea81593"
Subject: Re: [PHP-DEV] Changes to Git commit workflow
From: deleugyn@gmail.com (Deleu)

--000000000000bddc6605bea81593
Content-Type: text/plain; charset="UTF-8"

I think you only need to handle merges locally if the pull request author
didn't sign their commits:

> You can always push local commits to the branch if the commits are signed
and verified.
> You can also merge signed and verified commits into the branch using a
pull request on GitHub.
> However, you cannot squash and merge a pull request into the branch on
GitHub unless you are the
> author of the pull request. You can squash and merge pull requests
locally. For more information, see
>  "Checking out pull requests locally
<https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/checking-out-pull-requests-locally>
."

Source:
https://docs.github.com/en/github/administering-a-repository/about-protected-branches#require-signed-commits

On Mon, Mar 29, 2021, 06:19 Ayesh Karunaratne <ayesh@php.watch> wrote:

> I think this is a great step forward.
> With commit signatures required, I think the person who merges a PR
> now needs to do so locally. [GitHub CLI](https://cli.github.com/)
> helps me a lot to locally checkout a PR quickly, and then
> rebase/squash with my own signature.
>
> Thanks to Levi Morrison and Nikita for the very quick response.
>
> >
> > On Mon, 29 Mar 2021, 03:30 Rasmus Lerdorf, <rasmus@lerdorf.com> wrote:
> >
> > > On Sun, Mar 28, 2021 at 17:15 Sara Golemon <pollita@php.net> wrote:
> > >
> > > > On Sun, Mar 28, 2021 at 6:57 PM Paul Crovella <
> paul.crovella@gmail.com>
> > > > wrote:
> > > >
> > > >> You might consider requiring commits be signed while you're at it.
> > > >>
> > > >>
> > > > I suggested this as well, and even if we don't require it, we should
> > > > STRONGLY encourage it.
> > > >
> > > > I've been signing my commits for several years now, it's not even
> that
> > > > hard.
> > > >
> > > I think for php-src commits we can require it. For doc and other repos
> we
> > > can make it optional for now until people are more comfortable with it.
> > >
> > > -Rasmus
> >
> >
> > >
> > > We can require Signed Commits for the main active branches on GitHub:
> > >
> https://docs.github.com/en/github/administering-a-repository/about-protected-branches#require-signed-commits
> >
> >
> > We can create rules that requires that for all active maintained version
> of
> > PHP.
> >
> > We can set that per repo, or in a organization level.
> >
> > - Gabriel Caruso
>
> --
> PHP Internals - PHP Runtime Development Mailing List
> To unsubscribe, visit: https://www.php.net/unsub.php
>
>

--000000000000bddc6605bea81593--