New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

devtools: Auto-set branch to merge to in github-merge #7781

Merged
merged 1 commit into from Apr 5, 2016

Conversation

Projects
None yet
5 participants
@laanwj
Member

laanwj commented Apr 1, 2016

As we are already using the API to retrieve the pull request title, also retrieve the base branch.

This makes sure that pull requests for 0.12 automatically end up in 0.12, and pull requests for master automatically end up in master, and so on.

It prints the branch it is about to merge into. It is still possible to override the branch from the command line or using the githubmerge.branch git option.

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Apr 1, 2016

Member

Concept ACK; this has been a feature I've wanted for a while.

Member

sipa commented Apr 1, 2016

Concept ACK; this has been a feature I've wanted for a while.

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Apr 1, 2016

Member

Nice! Concept ACK.
Great safety measure also.

Member

jonasschnelli commented Apr 1, 2016

Nice! Concept ACK.
Great safety measure also.

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Apr 1, 2016

Member

utACK c1cff21

Member

MarcoFalke commented Apr 1, 2016

utACK c1cff21

@MarcoFalke

View changes

Show outdated Hide outdated contrib/devtools/github-merge.py
devtools: Auto-set branch to merge to in github-merge
As we are already using the API to retrieve the pull request
title, also retrieve the base branch.

This makes sure that pull requests for 0.12 automatically end up in
0.12, and pull requests for master automatically end up in master,
and so on.

It is still possible to override the branch from the command line
or using the `githubmerge.branch` git option.
@btcdrak

This comment has been minimized.

Show comment
Hide comment
@btcdrak

btcdrak Apr 5, 2016

Member

utACK 10d3ae1

Member

btcdrak commented Apr 5, 2016

utACK 10d3ae1

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Apr 5, 2016

Member

I've been using this version for a few days, both on master and 0.12, seems to work.
Tested ACK 10d3ae1

Member

laanwj commented Apr 5, 2016

I've been using this version for a few days, both on master and 0.12, seems to work.
Tested ACK 10d3ae1

@laanwj laanwj merged commit 10d3ae1 into bitcoin:master Apr 5, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Apr 5, 2016

Merge #7781: devtools: Auto-set branch to merge to in github-merge
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Sep 16, 2017

Merge #7781: devtools: Auto-set branch to merge to in github-merge
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Sep 19, 2017

Merge #7781: devtools: Auto-set branch to merge to in github-merge
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Dec 9, 2017

Merge #7781: devtools: Auto-set branch to merge to in github-merge
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Dec 19, 2017

Merge #7781: devtools: Auto-set branch to merge to in github-merge
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)

codablock added a commit to codablock/dash that referenced this pull request Dec 19, 2017

Merge #7781: devtools: Auto-set branch to merge to in github-merge
10d3ae1 devtools: Auto-set branch to merge to in github-merge (Wladimir J. van der Laan)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment