Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'liyuchun_fixbug' into 'master'

Browse Source 
* Fix bug #25176.

See merge request easycorp/zentaopms!4829
This commit is contained in:
孙广明
2022-08-08 02:34:19 +00:00
parent 8c7c196e70 a9661e5718
commit 03ffa85dba
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/git/model.php
+5 -3
View File
@@ -172,7 +172,10 @@ class gitModel extends model
if($printLog) $this->printLog("parsing log {$log->revision}");
if($printLog) $this->printLog("comment is\n----------\n" . trim($log->msg) . "\n----------");
$objects = $this->repo->parseComment($log->msg);
$objects = $this->repo->parseComment($log->msg);
$lastVersion = $version;
$version = $this->repo->saveOneCommit($repo->id, $log, $version, $branch);
if($objects)
{
if($printLog) $this->printLog('extract' .
@@ -180,7 +183,7 @@ class gitModel extends model
' task:' . join(' ', $objects['tasks']) .
' bug:' . join(',', $objects['bugs']));
$this->repo->saveAction2PMS($objects, $log, $this->repoRoot, $repo->encoding, 'git', $gitlabAccountPairs);
if($lastVersion != $version) $this->repo->saveAction2PMS($objects, $log, $this->repoRoot, $repo->encoding, 'git', $gitlabAccountPairs);
}
else
{
@@ -196,7 +199,6 @@ class gitModel extends model
if(strpos($log->msg, $comment) !== false) $this->loadModel('compile')->createByJob($job->id);
}
}
$version = $this->repo->saveOneCommit($repo->id, $log, $version, $branch);
$commits += count($logs);
}
}