Skip to content

Commit 37a3d11

Browse files
committed
Pull requests Merge SHA property is optional
1 parent 663af58 commit 37a3d11

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

lib/Github/Api/PullRequest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function merged($username, $repository, $id)
182182
return $this->get('/repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge');
183183
}
184184

185-
public function merge($username, $repository, $id, $message, $sha, $mergeMethod = 'merge', $title = null)
185+
public function merge($username, $repository, $id, $message, $sha = null, $mergeMethod = 'merge', $title = null)
186186
{
187187
if (is_bool($mergeMethod)) {
188188
$mergeMethod = $mergeMethod ? 'squash' : 'merge';
@@ -194,10 +194,12 @@ public function merge($username, $repository, $id, $message, $sha, $mergeMethod
194194

195195
$params = [
196196
'commit_message' => $message,
197-
'sha' => $sha,
198197
'merge_method' => $mergeMethod,
199198
];
200199

200+
if (is_string($sha)) {
201+
$params['sha'] = $sha;
202+
}
201203
if (is_string($title)) {
202204
$params['commit_title'] = $title;
203205
}

0 commit comments

Comments
 (0)