Re: Proposal: enabling git features

[Tai Dupree <td...@gmail.com>]

they've enabled the commit message settings, but looks like apache infra is
against auto-merge. They've told me to take it up with legal or infra vp to
get it changed.

On Tue, Aug 30, 2022 at 11:49 AM Tai Dupree <td...@gmail.com> wrote:

> opened an infra ticket: https://issues.apache.org/jira/browse/INFRA-23647
>
> On Tue, Aug 30, 2022 at 9:38 AM Pankaj soni <pa...@gmail.com>
> wrote:
>
>> +1
>>
>> On Tue, 30 Aug, 2022, 22:04 Maxime Beauchemin, <
>> maximebeauchemin@gmail.com>
>> wrote:
>>
>> > +1!!!
>> >
>> > On Tue, Aug 30, 2022, 9:23 AM Tai Dupree <td...@gmail.com> wrote:
>> >
>> > > Also, the auto-merge button only shows up while the PR is not yet in a
>> > > mergeable state. Once the merge button is green, it's just the regular
>> > > merge button we're all used to.
>> > >
>> > > On Tue, Aug 30, 2022 at 9:13 AM Tai Dupree <td...@gmail.com>
>> wrote:
>> > >
>> > > > Yes, auto-merge is completely opt-in per PR. The person pressing the
>> > > > button is given the option to edit the commit message and disable
>> the
>> > > > action too after submitting it. If you haven't enabled this in your
>> > other
>> > > > repos, I'd suggest giving it a try there. I find that it saves me a
>> lot
>> > > of
>> > > > time waiting around for reviews/CI. I think this doc
>> > > > <
>> > >
>> >
>> https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request
>> > >
>> > > does
>> > > > a better job describing the auto-merge process.
>> > > >
>> > > > On Tue, Aug 30, 2022 at 7:02 AM Beto Dealmeida
>> > > > <ro...@dealmeida.net.invalid> wrote:
>> > > >
>> > > >> I use auto-merge with Shillelagh. It's off by default and you
>> enable
>> > it
>> > > >> on a per-PR basis.
>> > > >>
>> > > >> --Beto
>> > > >>
>> > > >> On 8/30/22 8:52 AM, Diego Pucci wrote:
>> > > >> > Exactly the same thoughts from me. +1 for both changes if the
>> auto
>> > > >> merge is
>> > > >> > configurable on a PR basis and it is OFF by default.
>> > > >> >
>> > > >> > Il giorno mar 30 ago 2022 alle ore 14:45 Michael S. Molina <
>> > > >> > michael.s.molina@gmail.com> ha scritto:
>> > > >> >
>> > > >> >> There are PRs where the author waits for 2 or 3 approvals before
>> > > >> merging
>> > > >> >> it. If we are able to enable auto merge per PR as Elizabeth
>> > > mentioned,
>> > > >> then
>> > > >> >> +1 to both changes.
>> > > >> >>
>> > > >> >> Michael S. Molina
>> > > >> >>
>> > > >> >>> On Aug 30, 2022, at 3:19 AM, Elizabeth Thompson <
>> > eschutho@gmail.com
>> > > >
>> > > >> >> wrote:
>> > > >> >>> +1 on the PR titles for squashes. That would help a lot!
>> > > >> >>>
>> > > >> >>> For the auto merge, is that setting off by default per PR?
>> Reading
>> > > the
>> > > >> >> docs they say that you can enable/disable for each PR but not
>> what
>> > > the
>> > > >> >> default is (at least not that I saw). If we can have it default
>> to
>> > > >> manual,
>> > > >> >> I’d feel more comfortable in avoiding situations where PRs are
>> > merged
>> > > >> >> before the author is ready if they weren’t expecting it. +1 if
>> > that’s
>> > > >> the
>> > > >> >> case.
>> > > >> >>> Elizabeth
>> > > >> >>>
>> > > >> >>>> On Aug 29, 2022, at 9:28 PM, Tai Dupree <tdupreetan@gmail.com
>> >
>> > > >> wrote:
>> > > >> >>>>
>> > > >> >>>> Hi Team,
>> > > >> >>>>
>> > > >> >>>> There are a couple git features that I'd like to request
>> apache
>> > > >> infra to
>> > > >> >>>> enable. These settings are not supported by the asf.yaml
>> > > >> configuration.
>> > > >> >> I'd
>> > > >> >>>> like to request the following feature be enabled:
>> > > >> >>>>
>> > > >> >>>> - auto merge
>> > > >> >>>> <
>> > > >> >>
>> > > >>
>> > >
>> >
>> https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-auto-merge-for-pull-requests-in-your-repository
>> > > >> >>> ,
>> > > >> >>>> should make merges faster as CI can take long but having
>> github
>> > > merge
>> > > >> >> once
>> > > >> >>>> it's green would be a nice quality of life improvement.
>> > > >> >>>>
>> > > >> >>>> - Default to pull request titles for squash commits
>> > > >> >>>> <
>> > > >> >>
>> > > >>
>> > >
>> >
>> https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests
>> > > >> >>> ,
>> > > >> >>>> for some reason when there's only 1 commit in the PR, github
>> uses
>> > > the
>> > > >> >>>> commit message instead of the PR title. However, if the
>> contains
>> > > more
>> > > >> >> than
>> > > >> >>>> 1 commit, the PR title is used. This should make our git
>> history
>> > > >> better
>> > > >> >>>> since we have rules around PR titles.
>> > > >> >>>>
>> > > >> >>>> Please respond with any concerns, comments, or +1s. If there
>> are
>> > no
>> > > >> >>>> concerns over the next few days, I'll go ahead and open the
>> infra
>> > > >> >> ticket.
>> > > >> >>>> Best,
>> > > >> >>>> --
>> > > >> >>>> -Tai Dupree
>> > > >> >>
>> > > >>
>> > > >>
>> > > >
>> > > > --
>> > > > -Tai Dupree
>> > > >
>> > >
>> > >
>> > > --
>> > > -Tai Dupree
>> > >
>> >
>>
>
>
> --
> -Tai Dupree
>


-- 
-Tai Dupree