Skip to content

Add merge by squash option #380

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.

Sign up for GitHub

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
May 29, 2016
Merged

Add merge by squash option #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions lib/Github/Api/PullRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,18 @@ public function merged($username, $repository, $id)
return $this->get('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge');
}

public function merge($username, $repository, $id, $message, $sha)
public function merge($username, $repository, $id, $message, $sha, $squash = false, $title = null)
{
return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', array(
'commit_message' => $message, 'sha' => $sha
));
$params = array(
'commit_message' => $message,
'sha' => $sha,
'squash' => $squash,
Copy link
Contributor

@GrahamCampbell GrahamCampbell May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this break if not using the preview API?

Copy link
Contributor

@GrahamCampbell GrahamCampbell May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or does GitHub ignore the invalid extra field?

Copy link
Contributor Author

@soullivaneuh soullivaneuh May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you don't use the preview API, GitHub will just make a classic merge. 👍

Copy link
Contributor

@GrahamCampbell GrahamCampbell May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be safer to only pass through squash if it's set to true, otherwise omit it, wouldn't it?

Copy link
Contributor Author

@soullivaneuh soullivaneuh May 28, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would change nothing. If the parameter is not managed by GitHub API v3, it is simply ignored.

);

if (is_string($title)) {
$params['commit_title'] = $title;
}

return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', $params);
}
}
2 changes: 1 addition & 1 deletion test/Github/Tests/Api/PullRequestTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public function shouldMergePullRequest()
$api = $this->getApiMock();
$api->expects($this->once())
->method('put')
->with('repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something', 'sha' => str_repeat('A', 40)))
->with('repos/ezsystems/ezpublish/pulls/15/merge', array('commit_message' => 'Merged something', 'sha' => str_repeat('A', 40), 'squash' => false))
->will($this->returnValue($expectedArray));

$this->assertEquals($expectedArray, $api->merge('ezsystems', 'ezpublish', 15, 'Merged something', str_repeat('A', 40)));
Expand Down