Commitc076429

committed

Merge pull requestsigmavirus24#404 from drobertduke/stable/0.9

Add sha parameter to Pull Request merge

2 parents96316e1 +6ef02cb commitc076429Copy full SHA for c076429

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -300,16 +300,18 @@ def iter_issue_comments(self, number=-1, etag=None):`
`300`	`300`	`returnself._iter(int(number),url,IssueComment,etag=etag)`
`301`	`301`
`302`	`302`	`@requires_auth`
`303`		`-defmerge(self,commit_message=''):`
	`303`	`+defmerge(self,commit_message='',sha=None):`
`304`	`304`	`"""Merge this pull request.`
`305`	`305`
`306`	`306`	`:param str commit_message: (optional), message to be used for the`
`307`	`307`	`merge commit`
`308`	`308`	`:returns: bool`
`309`	`309`	`"""`
`310`		`-data=dumps({'commit_message':commit_message})`
	`310`	`+parameters= {'commit_message':commit_message}`
	`311`	`+ifsha:`
	`312`	`+parameters['sha']=sha`
`311`	`313`	`url=self._build_url('merge',base_url=self._api)`
`312`		`-json=self._json(self._put(url,data=data),200)`
	`314`	`+json=self._json(self._put(url,data=dumps(parameters)),200)`
`313`	`315`	`self.merge_commit_sha=json['sha']`
`314`	`316`	`returnjson['merged']`
`315`	`317`

Comments

(0)