8000 Add support from squash on pull request merge by megawac · Pull Request #608 · sigmavirus24/github3.py · GitHub
[go: up one dir, main page]

Skip to content

Add support from squash on pull request merge #608

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

Merged
merged 1 commit into from
May 5, 2016

Conversation

megawac
Copy link
Contributor
@megawac megawac commented May 4, 2016

@@ -313,14 +313,16 @@ def issue_comments(self, number=-1, etag=None):
return self._iter(int(number), url, IssueComment, etag=etag)

@requires_auth
def merge(self, commit_message='', sha=None):
def merge(self, commit_message='', squash=False, sha=None):
Copy link
Owner

Choose a reason for hiding this comment

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

Please move squash to the end. Since sha was there first, someone might be doing:

pr.merge(my_message, sha)

So squash should come last otherwise we will severely break existing code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

On Thu, May 5, 2016 at 1:21 PM, Ian Cordasco notifications@github.com
wrote:

In github3/pulls.py
#608 (comment)
:

@@ -313,14 +313,16 @@ def issue_comments(self, number=-1, etag=None):
return self._iter(int(number), url, IssueComment, etag=etag)

 @requires_auth
  • def merge(self, commit_message='', sha=None):
  • def merge(self, commit_message='', squash=False, sha=None):

Please move squash to the end. Since sha was there first, someone might
be doing:

pr.merge(my_message, sha)

So squash should come last otherwise we will severely break existing code.


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
https://github.com/sigmavirus24/github3.py/pull/608/files/6b9ef38131c0b535051c41131f04c5db575a8291#r62220756

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Although isn't this repo preparing for a 1.0 release, would this breaking change not be reasonable?

p.s. just fixed the unit tests, forgot to update unit tests

@sigmavirus24 sigmavirus24 merged commit f6948ac into sigmavirus24:develop May 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0