Merging PRs on the command line

Merging PRs on the command line

[Ken Dreyer]

Hi Loic,

I was reading over some of the HOWTO docs in the wiki, and saw the steps
here:

http://tracker.ceph.com/projects/ceph-releases/wiki/HOWTO_populate_the_integration_branch

It looks like you're using curl to get the title of the PR, populating
the commit message, etc.

I've found that GitHub's "hub" utility is really great for simplifying
this. I typically merge PRs in GitHub by running the following in my
local clone:

  git checkout master
  git pull
  hub merge https://github.com/ceph/ceph/pull/4658
  git commit --amend (to add my "Reviewed-by" line to the merge commit)
  git push

The hub utility uses GitHub's APIs to automatically add a
non-fast-forward commit with a "regular" commit message that looks
more-or-less identical to the one that I'd get if I clicked the "Merge"
button in the web UI.

The thing that sold me on this is that all the merge commits are
authored by "kdreyer@redhat.com" instead of my personal email address. I
found that when I clicked the "Merge" button in GitHub's web UI, the
merge commits were authored by my primary email address for my
"ktdreyer" GitHub UID, which isn't really what I want for Ceph.

- Ken

Re: Merging PRs on the command line

[Mark Nelson]

On 05/12/2015 04:58 PM, Ken Dreyer wrote:
> Hi Loic,
>
> I was reading over some of the HOWTO docs in the wiki, and saw the steps
> here:
>
> http://tracker.ceph.com/projects/ceph-releases/wiki/HOWTO_populate_the_integration_branch
>
> It looks like you're using curl to get the title of the PR, populating
> the commit message, etc.
>
> I've found that GitHub's "hub" utility is really great for simplifying
> this. I typically merge PRs in GitHub by running the following in my
> local clone:
>
>    git checkout master
>    git pull
>    hub merge https://github.com/ceph/ceph/pull/4658
>    git commit --amend (to add my "Reviewed-by" line to the merge commit)
>    git push
>
> The hub utility uses GitHub's APIs to automatically add a
> non-fast-forward commit with a "regular" commit message that looks
> more-or-less identical to the one that I'd get if I clicked the "Merge"
> button in the web UI.
>
> The thing that sold me on this is that all the merge commits are
> authored by "kdreyer@redhat.com" instead of my personal email address. I
> found that when I clicked the "Merge" button in GitHub's web UI, the
> merge commits were authored by my primary email address for my
> "ktdreyer" GitHub UID, which isn't really what I want for Ceph.

I've been using hub for cbt PRs as well ala:

http://blog.spreedly.com/2014/06/24/merge-pull-request-considered-harmful/#.VVJ3zn_qpt4

It's absolutely heavenly.

Mark

Re: Merging PRs on the command line

[Loic Dachary]

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

Hi Ken,

That's handy, thank you :-)

Cheers

On 12/05/2015 23:58, Ken Dreyer wrote:
> Hi Loic,
> 
> I was reading over some of the HOWTO docs in the wiki, and saw the steps
> here:
> 
> http://tracker.ceph.com/projects/ceph-releases/wiki/HOWTO_populate_the_integration_branch
> 
> It looks like you're using curl to get the title of the PR, populating
> the commit message, etc.
> 
> I've found that GitHub's "hub" utility is really great for simplifying
> this. I typically merge PRs in GitHub by running the following in my
> local clone:
> 
>   git checkout master
>   git pull
>   hub merge https://github.com/ceph/ceph/pull/4658
>   git commit --amend (to add my "Reviewed-by" line to the merge commit)
>   git push
> 
> The hub utility uses GitHub's APIs to automatically add a
> non-fast-forward commit with a "regular" commit message that looks
> more-or-less identical to the one that I'd get if I clicked the "Merge"
> button in the web UI.
> 
> The thing that sold me on this is that all the merge commits are
> authored by "kdreyer@redhat.com" instead of my personal email address. I
> found that when I clicked the "Merge" button in GitHub's web UI, the
> merge commits were authored by my primary email address for my
> "ktdreyer" GitHub UID, which isn't really what I want for Ceph.
> 
> - Ken
> --
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

-- 
Loïc Dachary, Artisan Logiciel Libre


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: Merging PRs on the command line

[Joao Eduardo Luis]

On 05/12/2015 10:58 PM, Ken Dreyer wrote:
> The thing that sold me on this is that all the merge commits are
> authored by "kdreyer@redhat.com" instead of my personal email address. I
> found that when I clicked the "Merge" button in GitHub's web UI, the
> merge commits were authored by my primary email address for my
> "ktdreyer" GitHub UID, which isn't really what I want for Ceph.

I thought this was solved by setting a secondary email as the
organization's default email, but now I see how wrong I was.  Merge
commits do go with my primary :(

  -Joao