From 37a3d11bcfb5124eb6f82fac1d0d64acec43247a Mon Sep 17 00:00:00 2001 From: Max Slotov Date: Thu, 29 May 2025 11:35:09 +0000 Subject: [PATCH] Pull requests Merge SHA property is optional --- lib/Github/Api/PullRequest.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Github/Api/PullRequest.php b/lib/Github/Api/PullRequest.php index 22922c1ee92..5086b8f476d 100644 --- a/lib/Github/Api/PullRequest.php +++ b/lib/Github/Api/PullRequest.php @@ -182,7 +182,7 @@ 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, $mergeMethod = 'merge', $title = null) + public function merge($username, $repository, $id, $message, $sha = null, $mergeMethod = 'merge', $title = null) { if (is_bool($mergeMethod)) { $mergeMethod = $mergeMethod ? 'squash' : 'merge'; @@ -194,10 +194,12 @@ public function merge($username, $repository, $id, $message, $sha, $mergeMethod $params = [ 'commit_message' => $message, - 'sha' => $sha, 'merge_method' => $mergeMethod, ]; + if (is_string($sha)) { + $params['sha'] = $sha; + } if (is_string($title)) { $params['commit_title'] = $title; }