8000 Add support for default commit message · omgjlk/github3.py@533130d · GitHub
[go: up one dir, main page]

Skip to content

Commit 533130d

Browse files
committed
Add support for default commit message
Fixes sigmavirus24#649.
1 parent e57cdf6 commit 533130d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

github3/pulls.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ def issue_comments(self, number=-1, etag=None):
311311
return self._iter(int(number), url, IssueComment, etag=etag)
312312

313313
@requires_auth
314-
def merge(self, commit_message='', sha=None, squash=False):
314+
def merge(self, commit_message=None, sha=None, squash=False):
315315
"""Merge this pull request.
316316
317317
:param str commit_message: (optional), message to be used for the
@@ -322,9 +322,11 @@ def merge(self, commit_message='', sha=None, squash=False):
322322
head branch.
323323
:returns: bool
324324
"""
325-
parameters = {'commit_message': commit_message, 'squash': squash}
325+
parameters = {'squash': squash}
326326
if sha:
327327
parameters['sha'] = sha
328+
if commit_message is not None:
329+
parameters['commit_message'] = commit_message
328330
url = self._build_url('merge', base_url=self._api)
329331
json = self._json(self._put(url, data=dumps(parameters)), 200)
330332
if not json:

0 commit comments

Comments
 (0)
0