Merge pull request sigmavirus24#404 from drobertduke/stable/0.9

sigmavirus24 · sigmavirus24 · commit c076429a28f3 · 2015-07-02T18:54:03.000-05:00
Add sha parameter to Pull Request merge
diff --git a/github3/pulls.py b/github3/pulls.py
@@ -300,16 +300,18 @@ def iter_issue_comments(self, number=-1, etag=None):
         return self._iter(int(number), url, IssueComment, etag=etag)
 
     @requires_auth
-    def merge(self, commit_message=''):
+    def merge(self, commit_message='', sha=None):
         """Merge this pull request.
 
         :param str commit_message: (optional), message to be used for the
             merge commit
         :returns: bool
         """
-        data = dumps({'commit_message': commit_message})
+        parameters = {'commit_message': commit_message}
+        if sha:
+            parameters['sha'] = sha
         url = self._build_url('merge', base_url=self._api)
-        json = self._json(self._put(url, data=data), 200)
+        json = self._json(self._put(url, data=dumps(parameters)), 200)
         self.merge_commit_sha = json['sha']
         return json['merged']
 
