Commit96316e1

committed

Merge pull requestsigmavirus24#391 from antoine-g/issue/370-backport0.9

Fix exception when merging with empty commit message (backport)

2 parentse1d7b17 +ce5c850 commit96316e1Copy full SHA for 96316e1

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -307,9 +307,7 @@ def merge(self, commit_message=''):`
`307`	`307`	`merge commit`
`308`	`308`	`:returns: bool`
`309`	`309`	`"""`
`310`		`-data=None`
`311`		`-ifcommit_message:`
`312`		`-data=dumps({'commit_message':commit_message})`
	`310`	`+data=dumps({'commit_message':commit_message})`
`313`	`311`	`url=self._build_url('merge',base_url=self._api)`
`314`	`312`	`json=self._json(self._put(url,data=data),200)`
`315`	`313`	`self.merge_commit_sha=json['sha']`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ def test_iter_files(self):`
`107`	`107`	`deftest_merge(self):`
`108`	`108`	`self.response('merge',200)`
`109`	`109`	`self.put(self.api+'/merge')`
`110`		`-self.conf= {'data':None}`
	`110`	`+self.conf= {'data':{'commit_message':''}}`
`111`	`111`
`112`	`112`	`self.assertRaises(github3.GitHubError,self.pull.merge)`
`113`	`113`

Comments

(0)