NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commit90c6b7c

committed

Fix exception when merging with empty commit message

Fixessigmavirus24#370The GitHub API now requires a param `commit_message` with an empty value ''when merging a pull request. In such case the default value is used as acommit message.Providing an empty data string no longer works.(cherry picked from commit39c06c9)Conflicts:tests/unit/test_pulls.pyThe test file was not backported because it doesn't exist on thedestination branch.

1 parente1d7b17 commit90c6b7cCopy full SHA for 90c6b7c

File tree

1 file changed

-3

lines changed

github3
- pulls.py

1 file changed

-3

lines changed

`‎github3/pulls.py‎`

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']`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit90c6b7c

File tree

1 file changed

1 file changed

`‎github3/pulls.py‎`

0 commit comments