Skip to content

Fix exception when merging with empty commit message #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2015

Conversation

antoine-g
Copy link
Contributor

Fixes #370

As I also experienced the error and the issue has not been active for 2 weeks, I thought I would submit a PR. Feel free to accept or reject this fix. It may conflict with #381.

The 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 a commit message.
Providing an empty data string no longer works.

Fixes sigmavirus24#370

The 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 a
commit message.
Providing an empty data string no longer works.
@sigmavirus24
Copy link
Owner

@antoine-g thanks for the pull request. Do you need this backported to 0.9 or are you using the 1.0 prerelease?

sigmavirus24 added a commit that referenced this pull request Jun 16, 2015
Fix exception when merging with empty commit message
@sigmavirus24 sigmavirus24 merged commit a58fbef into sigmavirus24:develop Jun 16, 2015
@antoine-g
Copy link
Contributor Author

We are still using 0.8.2 actually, we plan to upgrade to 0.9 soon.
This might lead to extra work on your side to backport so I don't want to push it but if you have other fixes to backport, it would be nice to get this in 0.9 😄

Thanks for your reactivity

@antoine-g antoine-g deleted the issue/370 branch June 16, 2015 13:18
@sigmavirus24
Copy link
Owner

Yeah backporting it to 0.9 should be as simple as:

$ git checkout stable/0.9
$ git cherry-pick -x  39c06c9

That said, if you want to do that and send a PR to stable/0.9 it would ensure this doesn't fall off my radar since my TODO list is rather long.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants