Merge pull request sigmavirus24#650 from broady/patch-1

itsmemattchung · web-flow · commit 67f38a20911f · 2016-12-17T18:42:32.000+05:30
Add support for default commit message
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -311,7 +311,7 @@ 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, squash=False):
+    def merge(self, commit_message=None, sha=None, squash=False):
         """Merge this pull request.
 
         :param str commit_message: (optional), message to be used for the
@@ -322,9 +322,11 @@ def merge(self, commit_message='', sha=None, squash=False):
             head branch.
         :returns: bool
         """
-        parameters = {'commit_message': commit_message, 'squash': squash}
+        parameters = {'squash': squash}
         if sha:
             parameters['sha'] = sha
+        if commit_message is not None:
+            parameters['commit_message'] = commit_message
         url = self._build_url('merge', base_url=self._api)
         json = self._json(self._put(url, data=dumps(parameters)), 200)
         if not json:
diff --git a/tests/unit/test_pulls.py b/tests/unit/test_pulls.py
@@ -95,7 +95,7 @@ def test_merge(self):
 
         self.put_called_with(
             url_for('merge'),
-            data={"squash": False, "commit_message": ""}
+            data={"squash": False}
         )
 
     def test_merge_squash_message(self):

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ def test_merge(self):`
`95`	`95`
`96`	`96`	`self.put_called_with(`
`97`	`97`	`url_for('merge'),`
`98`		`- data={"squash": False, "commit_message": ""}`
	`98`	`+ data={"squash": False}`
`99`	`99`	`)`
`100`	`100`
`101`	`101`	`def test_merge_squash_message(self):`