Re: Merging via GitHub

classic Classic list List threaded Threaded
9 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

Benson Margulies
Could you send me a pointer to refresh my memory on procedures? It's been a
while ...

On Mon, May 11, 2020 at 1:42 PM Michael Osipov <[hidden email]> wrote:

> Folks,
>
> please do NOT merge via merge button in GitHub:
>
> > commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master,
> origin/HEAD)
> > Merge: 34253e3d f7de3a6e
> > Author: Elliotte Rusty Harold <[hidden email]>
> > Commit: GitHub <[hidden email]>
> >
> >     Merge pull request #66 from apache/plex
> >
> >     [SCM-930] update plexus-utils
> >
> > commit f7de3a6ea5e182d7fab28e8f0548da2324097ba9
> > Author: Elliotte Rusty Harold <[hidden email]>
> > Commit: Elliotte Rusty Harold <[hidden email]>
> >
> >     update plexus-utils
>
> 1. It produces useless merge commits
> 2. GitHub is NOT a blessed committer
>
> It is OK, wenn a clean rebased merge is performed and not traces of
> GitHub are left.
>
> Michael
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

David Jencks-4
It's possible to configure GitHub to allow rebase and merge, which I think is what you want.  It may be possible to configure GitHub to only allow this.  I’m not sure if this is something infra has to do or if a project admin can set it up.  Camel recently made a related change.

David Jencks

> On May 11, 2020, at 3:23 PM, Benson Margulies <[hidden email]> wrote:
>
> Could you send me a pointer to refresh my memory on procedures? It's been a
> while ...
>
> On Mon, May 11, 2020 at 1:42 PM Michael Osipov <[hidden email]> wrote:
>
>> Folks,
>>
>> please do NOT merge via merge button in GitHub:
>>
>>> commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master,
>> origin/HEAD)
>>> Merge: 34253e3d f7de3a6e
>>> Author: Elliotte Rusty Harold <[hidden email]>
>>> Commit: GitHub <[hidden email]>
>>>
>>>    Merge pull request #66 from apache/plex
>>>
>>>    [SCM-930] update plexus-utils
>>>
>>> commit f7de3a6ea5e182d7fab28e8f0548da2324097ba9
>>> Author: Elliotte Rusty Harold <[hidden email]>
>>> Commit: Elliotte Rusty Harold <[hidden email]>
>>>
>>>    update plexus-utils
>>
>> 1. It produces useless merge commits
>> 2. GitHub is NOT a blessed committer
>>
>> It is OK, wenn a clean rebased merge is performed and not traces of
>> GitHub are left.
>>
>> Michael
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: [hidden email]
>> For additional commands, e-mail: [hidden email]
>>
>>


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

Hervé BOUTEMY
it can be configured at ASF with .asf.yaml setting:
https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons

Le mardi 12 mai 2020, 00:45:31 CEST David Jencks a écrit :

> It's possible to configure GitHub to allow rebase and merge, which I think
> is what you want.  It may be possible to configure GitHub to only allow
> this.  I’m not sure if this is something infra has to do or if a project
> admin can set it up.  Camel recently made a related change.
>
> David Jencks
>
> > On May 11, 2020, at 3:23 PM, Benson Margulies <[hidden email]>
> > wrote:
> >
> > Could you send me a pointer to refresh my memory on procedures? It's been
> > a
> > while ...
> >
> > On Mon, May 11, 2020 at 1:42 PM Michael Osipov <[hidden email]> wrote:
> >> Folks,
> >>
> >> please do NOT merge via merge button in GitHub:
> >>> commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master,
> >>
> >> origin/HEAD)
> >>
> >>> Merge: 34253e3d f7de3a6e
> >>> Author: Elliotte Rusty Harold <[hidden email]>
> >>> Commit: GitHub <[hidden email]>
> >>>
> >>>    Merge pull request #66 from apache/plex
> >>>    
> >>>    [SCM-930] update plexus-utils
> >>>
> >>> commit f7de3a6ea5e182d7fab28e8f0548da2324097ba9
> >>> Author: Elliotte Rusty Harold <[hidden email]>
> >>> Commit: Elliotte Rusty Harold <[hidden email]>
> >>>
> >>>    update plexus-utils
> >>
> >> 1. It produces useless merge commits
> >> 2. GitHub is NOT a blessed committer
> >>
> >> It is OK, wenn a clean rebased merge is performed and not traces of
> >> GitHub are left.
> >>
> >> Michael
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: [hidden email]
> >> For additional commands, e-mail: [hidden email]
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]





---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

Tibor Digana
I have checked it out with all three enabled in [1] but i still see the
same number of buttons as before. How it should behave?
I would like to have the rebase even in the squash but the comment above
the "rebase: true" says "button" and not a "behavior" in another buttons
e.g, "Squash and merge".

[1]: https://github.com/apache/maven-surefire/pull/295

On Tue, May 12, 2020 at 12:28 PM Hervé BOUTEMY <[hidden email]>
wrote:

> it can be configured at ASF with .asf.yaml setting:
>
> https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons
>
> Le mardi 12 mai 2020, 00:45:31 CEST David Jencks a écrit :
> > It's possible to configure GitHub to allow rebase and merge, which I
> think
> > is what you want.  It may be possible to configure GitHub to only allow
> > this.  I’m not sure if this is something infra has to do or if a project
> > admin can set it up.  Camel recently made a related change.
> >
> > David Jencks
> >
> > > On May 11, 2020, at 3:23 PM, Benson Margulies <[hidden email]>
> > > wrote:
> > >
> > > Could you send me a pointer to refresh my memory on procedures? It's
> been
> > > a
> > > while ...
> > >
> > > On Mon, May 11, 2020 at 1:42 PM Michael Osipov <[hidden email]>
> wrote:
> > >> Folks,
> > >>
> > >> please do NOT merge via merge button in GitHub:
> > >>> commit 158f54e3abc5c1d602146a08902482b6a19e2c27 (origin/master,
> > >>
> > >> origin/HEAD)
> > >>
> > >>> Merge: 34253e3d f7de3a6e
> > >>> Author: Elliotte Rusty Harold <[hidden email]>
> > >>> Commit: GitHub <[hidden email]>
> > >>>
> > >>>    Merge pull request #66 from apache/plex
> > >>>
> > >>>    [SCM-930] update plexus-utils
> > >>>
> > >>> commit f7de3a6ea5e182d7fab28e8f0548da2324097ba9
> > >>> Author: Elliotte Rusty Harold <[hidden email]>
> > >>> Commit: Elliotte Rusty Harold <[hidden email]>
> > >>>
> > >>>    update plexus-utils
> > >>
> > >> 1. It produces useless merge commits
> > >> 2. GitHub is NOT a blessed committer
> > >>
> > >> It is OK, wenn a clean rebased merge is performed and not traces of
> > >> GitHub are left.
> > >>
> > >> Michael
> > >>
> > >> ---------------------------------------------------------------------
> > >> To unsubscribe, e-mail: [hidden email]
> > >> For additional commands, e-mail: [hidden email]
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: [hidden email]
> > For additional commands, e-mail: [hidden email]
>
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

olamy
I wonder what is exactly the problem here? (except a noisy commit but who
cares really compared to the useless noise email notifications when someone
rebase a branch....)
But at least there are real person name.
That's weird because I just used the "Squash and merge' for this PR (
https://github.com/apache/maven-shared-utils/pull/30) and got nice commit
https://github.com/apache/maven-shared-utils/commit/32942621ff5df2f8779e0f55276c902a1fcb42b9
Elliotte  Maybe something with your GH configuration?

I have definitely more concerns with this one
https://github.com/apache/maven-shared-utils/commit/bb2f85e98c3c651ae50b7f642500cb74f50abb0d

some github UI features show it as `dependabot-preview authored and
slachiewicz committed`
But looking at log with a real git tool call 'git' :) I get


commit bb2f85e98c3c651ae50b7f642500cb74f50abb0d
Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@
users.noreply.github.com>
Date:   Mon Mar 9 04:19:41 2020 +0000
    Bump hamcrest-core from 1.3 to 2.2
Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from 1.3 to
2.2.
- [Release notes](https://github.com/hamcrest/JavaHamcrest/releases)
- [Changelog](
https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md)
- [Commits](
https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2)

Signed-off-by: dependabot-preview[bot] <[hidden email]>

And this is totally wrong! we must have a real person name in the commit
logs (and github UI is not the real commit logs).
not sure how to fix that....
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

David Jencks-4
As a side note, I’m personally in favor of the author squashing manually and the “merge” into master using rebase-and-commit.

To your main issue, I’m pretty sure that GitHub doesn’t keep any secret information, instead you are using an insufficiently verbose log command.  Try

git log --pretty=fuller

By default git log just shows the author, and you are looking for the committer (person who merged in the commit).

See git-log <https://git-scm.com/docs/git-log#_pretty_formats>

david jencks

> On May 16, 2020, at 4:53 PM, Olivier Lamy <[hidden email]> wrote:
>
> I wonder what is exactly the problem here? (except a noisy commit but who
> cares really compared to the useless noise email notifications when someone
> rebase a branch....)
> But at least there are real person name.
> That's weird because I just used the "Squash and merge' for this PR (
> https://github.com/apache/maven-shared-utils/pull/30) and got nice commit
> https://github.com/apache/maven-shared-utils/commit/32942621ff5df2f8779e0f55276c902a1fcb42b9
> Elliotte  Maybe something with your GH configuration?
>
> I have definitely more concerns with this one
> https://github.com/apache/maven-shared-utils/commit/bb2f85e98c3c651ae50b7f642500cb74f50abb0d
>
> some github UI features show it as `dependabot-preview authored and
> slachiewicz committed`
> But looking at log with a real git tool call 'git' :) I get
>
>
> commit bb2f85e98c3c651ae50b7f642500cb74f50abb0d
> Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@
> users.noreply.github.com>
> Date:   Mon Mar 9 04:19:41 2020 +0000
>    Bump hamcrest-core from 1.3 to 2.2
> Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from 1.3 to
> 2.2.
> - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases)
> - [Changelog](
> https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md)
> - [Commits](
> https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2)
>
> Signed-off-by: dependabot-preview[bot] <[hidden email]>
>
> And this is totally wrong! we must have a real person name in the commit
> logs (and github UI is not the real commit logs).
> not sure how to fix that....

Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

olamy
On Sun, 17 May 2020 at 11:40, David Jencks <[hidden email]> wrote:

> As a side note, I’m personally in favor of the author squashing manually
> and the “merge” into master using rebase-and-commit.
>
> To your main issue, I’m pretty sure that GitHub doesn’t keep any secret
> information, instead you are using an insufficiently verbose log command.
> Try
>
> git log --pretty=fuller
>
> By default git log just shows the author, and you are looking for the
> committer (person who merged in the commit).
>
> See git-log <https://git-scm.com/docs/git-log#_pretty_formats>
>

argghhh I haven;t down enough with git help log :)
Thanks for the tip


>
> david jencks
>
> > On May 16, 2020, at 4:53 PM, Olivier Lamy <[hidden email]> wrote:
> >
> > I wonder what is exactly the problem here? (except a noisy commit but who
> > cares really compared to the useless noise email notifications when
> someone
> > rebase a branch....)
> > But at least there are real person name.
> > That's weird because I just used the "Squash and merge' for this PR (
> > https://github.com/apache/maven-shared-utils/pull/30) and got nice
> commit
> >
> https://github.com/apache/maven-shared-utils/commit/32942621ff5df2f8779e0f55276c902a1fcb42b9
> > Elliotte  Maybe something with your GH configuration?
> >
> > I have definitely more concerns with this one
> >
> https://github.com/apache/maven-shared-utils/commit/bb2f85e98c3c651ae50b7f642500cb74f50abb0d
> >
> > some github UI features show it as `dependabot-preview authored and
> > slachiewicz committed`
> > But looking at log with a real git tool call 'git' :) I get
> >
> >
> > commit bb2f85e98c3c651ae50b7f642500cb74f50abb0d
> > Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@
> > users.noreply.github.com>
> > Date:   Mon Mar 9 04:19:41 2020 +0000
> >    Bump hamcrest-core from 1.3 to 2.2
> > Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from
> 1.3 to
> > 2.2.
> > - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases)
> > - [Changelog](
> > https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md)
> > - [Commits](
> >
> https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2)
> >
> > Signed-off-by: dependabot-preview[bot] <[hidden email]>
> >
> > And this is totally wrong! we must have a real person name in the commit
> > logs (and github UI is not the real commit logs).
> > not sure how to fix that....
>
>

--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

olamy
and yeah that's embarrassing
someone mentioned using a script. where is this script?

On Sun, 17 May 2020 at 11:51, Olivier Lamy <[hidden email]> wrote:

>
>
> On Sun, 17 May 2020 at 11:40, David Jencks <[hidden email]>
> wrote:
>
>> As a side note, I’m personally in favor of the author squashing manually
>> and the “merge” into master using rebase-and-commit.
>>
>> To your main issue, I’m pretty sure that GitHub doesn’t keep any secret
>> information, instead you are using an insufficiently verbose log command.
>> Try
>>
>> git log --pretty=fuller
>>
>> By default git log just shows the author, and you are looking for the
>> committer (person who merged in the commit).
>>
>> See git-log <https://git-scm.com/docs/git-log#_pretty_formats>
>>
>
> argghhh I haven;t down enough with git help log :)
> Thanks for the tip
>
>
>>
>> david jencks
>>
>> > On May 16, 2020, at 4:53 PM, Olivier Lamy <[hidden email]> wrote:
>> >
>> > I wonder what is exactly the problem here? (except a noisy commit but
>> who
>> > cares really compared to the useless noise email notifications when
>> someone
>> > rebase a branch....)
>> > But at least there are real person name.
>> > That's weird because I just used the "Squash and merge' for this PR (
>> > https://github.com/apache/maven-shared-utils/pull/30) and got nice
>> commit
>> >
>> https://github.com/apache/maven-shared-utils/commit/32942621ff5df2f8779e0f55276c902a1fcb42b9
>> > Elliotte  Maybe something with your GH configuration?
>> >
>> > I have definitely more concerns with this one
>> >
>> https://github.com/apache/maven-shared-utils/commit/bb2f85e98c3c651ae50b7f642500cb74f50abb0d
>> >
>> > some github UI features show it as `dependabot-preview authored and
>> > slachiewicz committed`
>> > But looking at log with a real git tool call 'git' :) I get
>> >
>> >
>> > commit bb2f85e98c3c651ae50b7f642500cb74f50abb0d
>> > Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@
>> > users.noreply.github.com>
>> > Date:   Mon Mar 9 04:19:41 2020 +0000
>> >    Bump hamcrest-core from 1.3 to 2.2
>> > Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from
>> 1.3 to
>> > 2.2.
>> > - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases)
>> > - [Changelog](
>> > https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md)
>> > - [Commits](
>> >
>> https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2
>> )
>> >
>> > Signed-off-by: dependabot-preview[bot] <[hidden email]>
>> >
>> > And this is totally wrong! we must have a real person name in the commit
>> > logs (and github UI is not the real commit logs).
>> > not sure how to fix that....
>>
>>
>
> --
> Olivier Lamy
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>


--
Olivier Lamy
http://twitter.com/olamy | http://linkedin.com/in/olamy
Reply | Threaded
Open this post in threaded view
|

Re: Merging via GitHub

Enrico Olivelli
Olivier

Il giorno dom 17 mag 2020 alle ore 04:00 Olivier Lamy <[hidden email]> ha
scritto:

> and yeah that's embarrassing
> someone mentioned using a script. where is this script?
>

I have a script that syncs the PR with a local branch. It is very raw so it
is not worth to share

btw in ZooKeeper community we have this wonderful script
https://github.com/apache/zookeeper/blob/master/zk-merge-pr.py

it performs these steps:
- downloads the PR
- squash all of the commits (preserving the author)
- pushes to the target branch
- add fixVersion to JIRA
- Resolves the issue on JIRA

The only tricky part for us in Maven is that we need to push the branch to
ASF repo in order to kick CI in

But if anyone is interested in improving the script...
I feel we will save lot of time and allow a better learning curve for new
committers

Enrico

Enrico



>
> On Sun, 17 May 2020 at 11:51, Olivier Lamy <[hidden email]> wrote:
>
> >
> >
> > On Sun, 17 May 2020 at 11:40, David Jencks <[hidden email]>
> > wrote:
> >
> >> As a side note, I’m personally in favor of the author squashing manually
> >> and the “merge” into master using rebase-and-commit.
> >>
> >> To your main issue, I’m pretty sure that GitHub doesn’t keep any secret
> >> information, instead you are using an insufficiently verbose log
> command.
> >> Try
> >>
> >> git log --pretty=fuller
> >>
> >> By default git log just shows the author, and you are looking for the
> >> committer (person who merged in the commit).
> >>
> >> See git-log <https://git-scm.com/docs/git-log#_pretty_formats>
> >>
> >
> > argghhh I haven;t down enough with git help log :)
> > Thanks for the tip
> >
> >
> >>
> >> david jencks
> >>
> >> > On May 16, 2020, at 4:53 PM, Olivier Lamy <[hidden email]> wrote:
> >> >
> >> > I wonder what is exactly the problem here? (except a noisy commit but
> >> who
> >> > cares really compared to the useless noise email notifications when
> >> someone
> >> > rebase a branch....)
> >> > But at least there are real person name.
> >> > That's weird because I just used the "Squash and merge' for this PR (
> >> > https://github.com/apache/maven-shared-utils/pull/30) and got nice
> >> commit
> >> >
> >>
> https://github.com/apache/maven-shared-utils/commit/32942621ff5df2f8779e0f55276c902a1fcb42b9
> >> > Elliotte  Maybe something with your GH configuration?
> >> >
> >> > I have definitely more concerns with this one
> >> >
> >>
> https://github.com/apache/maven-shared-utils/commit/bb2f85e98c3c651ae50b7f642500cb74f50abb0d
> >> >
> >> > some github UI features show it as `dependabot-preview authored and
> >> > slachiewicz committed`
> >> > But looking at log with a real git tool call 'git' :) I get
> >> >
> >> >
> >> > commit bb2f85e98c3c651ae50b7f642500cb74f50abb0d
> >> > Author: dependabot-preview[bot] <27856297+dependabot-preview[bot]@
> >> > users.noreply.github.com>
> >> > Date:   Mon Mar 9 04:19:41 2020 +0000
> >> >    Bump hamcrest-core from 1.3 to 2.2
> >> > Bumps [hamcrest-core](https://github.com/hamcrest/JavaHamcrest) from
> >> 1.3 to
> >> > 2.2.
> >> > - [Release notes](https://github.com/hamcrest/JavaHamcrest/releases)
> >> > - [Changelog](
> >> > https://github.com/hamcrest/JavaHamcrest/blob/master/CHANGES.md)
> >> > - [Commits](
> >> >
> >>
> https://github.com/hamcrest/JavaHamcrest/compare/hamcrest-java-1.3...v2.2
> >> )
> >> >
> >> > Signed-off-by: dependabot-preview[bot] <[hidden email]>
> >> >
> >> > And this is totally wrong! we must have a real person name in the
> commit
> >> > logs (and github UI is not the real commit logs).
> >> > not sure how to fix that....
> >>
> >>
> >
> > --
> > Olivier Lamy
> > http://twitter.com/olamy | http://linkedin.com/in/olamy
> >
>
>
> --
> Olivier Lamy
> http://twitter.com/olamy | http://linkedin.com/in/olamy
>