Merge branch 'devops23_20299' into 'master'

bug 20299

See merge request easycorp/zentaopms!2121
This commit is contained in:
李玉春
2022-03-08 00:25:19 +00:00
+3 -3
View File
@@ -512,11 +512,11 @@ class GitRepo
* @access public
* @return array
*/
public function getCommits($rversion = '', $count = 0, $branch = '')
public function getCommits($revision = '', $count = 0, $branch = '')
{
if(!scm::checkRevision($rversion)) return array();
if(!scm::checkRevision($revision)) return array();
if($rversion == 'HEAD' and $branch) $rversion = $branch;
if($revision == 'HEAD' and $branch) $revision = $branch;
$revision = is_numeric($revision) ? "--skip=$revision $branch" : $revision;
$count = $count == 0 ? '' : "-n $count";