Merge pull request #379 from Soullivaneuh/patch-2

Add commit_message parameter on Repo::merge only if given
KnpLabs · May 29, 2016 · 6632c88 · 6632c88
2 parents f77df24 + 3acf131
commit 6632c88
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/Github/Api/Repo.php b/lib/Github/Api/Repo.php
@@ -488,11 +488,16 @@ public function subscribers($username, $repository, $page = 1)
      */
     public function merge($username, $repository, $base, $head, $message = null)
     {
-        return $this->post('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/merges', array(
-            'base'           => $base,
-            'head'           => $head,
-            'commit_message' => $message
-        ));
+        $parameters = array(
+            'base' => $base,
+            'head' => $head,
+        );
+
+        if (is_string($message)) {
+            $parameters['commit_message'] = $message;
+        }
+
+        return $this->post('repos/'.rawurlencode($username).'/'.rawurlencode($repository).'/merges', $parameters);
     }
 
     /**