Skip to content

Commit af12ef9

Browse files
Fixed broken merge function
1 parent b472cd0 commit af12ef9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/Github/Api/PullRequest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ public function merged($username, $repository, $id)
115115
return $this->get('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge');
116116
}
117117

118-
public function merge($username, $repository, $id, $message = '')
118+
public function merge($username, $repository, $id, $message, $sha)
119119
{
120120
return $this->put('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/pulls/'.rawurlencode($id).'/merge', array(
121-
'commit_message' => $message
121+
'commit_message' => $message, 'sha' => $sha
122122
));
123123
}
124124
}

0 commit comments

Comments
 (0)