Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Adding delete_branch_on_merge support for repos #1388

Merged
merged 1 commit into from
Jan 27, 2020
Merged

Adding delete_branch_on_merge support for repos #1388

merged 1 commit into from
Jan 27, 2020

Conversation

stefansedich
Copy link
Contributor

@stefansedich stefansedich commented Jan 20, 2020 •
edited
Loading

Adding support for the new delete_branch_on_merge setting for repositories.

"Finally" Closes #1245

@googlebot
Copy link

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@googlebot
Copy link

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@googlebot googlebot added cla: yes Indication that the PR author has signed a Google Contributor License Agreement. and removed cla: no labels Jan 20, 2020
gmlewis
gmlewis requested changes Jan 21, 2020
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @stefansedich, but this won't work yet as written. Please address the comment below.

Otherwise, LGTM.

After you make the requested change and we get a second LGTM, we can merge.

github/repos.go
AllowSquashMerge *bool `json:"allow_squash_merge,omitempty"`
AllowMergeCommit *bool `json:"allow_merge_commit,omitempty"`
AllowRebaseMerge *bool `json:"allow_rebase_merge,omitempty"`
DeleteBranchOnMerge *bool `json:"delete_branch_on_merge,omitempty"`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please copy this new field's value after line 347 below, otherwise it has no effect.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad 😞 my grep had failed me finding the places the other fields were set I assumed it was some magic but missed this obvious place! Should be fixed.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem! That's why we do code reviews! 😄
That's nothing compared to some of the things I've done. 😄
Thank you for fixing it!

gmlewis
gmlewis approved these changes Jan 21, 2020
View reviewed changes
Copy link
Collaborator

@gmlewis gmlewis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, @stefansedich!
LGTM.

Awaiting second LGTM before merging.

@stefansedich stefansedich mentioned this pull request Jan 21, 2020
Closed
@gmlewis gmlewis requested a review from gauntface January 21, 2020 17:38
@skeggse skeggse mentioned this pull request Jan 27, 2020
Closed
wesleimp
wesleimp approved these changes Jan 27, 2020
View reviewed changes
Copy link
Collaborator

@wesleimp wesleimp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

@gmlewis
Copy link
Collaborator

gmlewis commented Jan 27, 2020

Thank you, @wesleimp!
Merging.

@gmlewis gmlewis merged commit 8025ca2 into google:master Jan 27, 2020
@sstarcher sstarcher mentioned this pull request Jan 27, 2020
Closed
bltavares added a commit to bltavares/terraform-provider-github that referenced this pull request Mar 30, 2020
@bltavares
Introduce option to manage Delete Branch on Merge
9a5df46 
Since [this commit](google/go-github#1388) it
is possible to manage if the project should close branches automatically
after a PR is merged.

The current version on this project already supports this new config.

This commit introduces the new option, using the same default as the
GitHub API uses.

Fix https://github.com/terraform-providers/terraform-provider-github/issues/264
@bltavares bltavares mentioned this pull request Mar 30, 2020
Merged
n1lesh pushed a commit to n1lesh/go-github that referenced this pull request Oct 2, 2020
@stefansedich @gmlewis
Add delete_branch_on_merge support for repos (google#1388)
88e7b0d 
Fixes google#1245.
kfcampbell pushed a commit to kfcampbell/terraform-provider-github that referenced this pull request Jul 26, 2022
@bltavares
Introduce option to manage Delete Branch on Merge
9367d76 
Since [this commit](google/go-github#1388) it
is possible to manage if the project should close branches automatically
after a PR is merged.

The current version on this project already supports this new config.

This commit introduces the new option, using the same default as the
GitHub API uses.

Fix https://github.com/terraform-providers/terraform-provider-github/issues/264
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wesleimp wesleimp wesleimp approved these changes

@gmlewis gmlewis gmlewis approved these changes

@gauntface gauntface Awaiting requested review from gauntface

Assignees
No one assigned
Labels
cla: yes Indication that the PR author has signed a Google Contributor License Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support deleting head branch of GitHub pull requests
4 participants
@stefansedich @googlebot @gmlewis @wesleimp