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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2018-11-27 09:03:01 +08:00
parent 78441e51f9
commit f69fd87feb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/git/model.php
View File

@@ -107,7 +107,7 @@ class gitModel extends model
$this->printLog("parsing log {$log->revision}");
if($log->revision == $savedRevision)
{
$this->printLog("{$log->revision} alread parsed, ommit it");
$this->printLog("{$log->revision} alread parsed, commit it");
continue;
}
@@ -321,11 +321,10 @@ class gitModel extends model
*/
public function convertLog($log)
{
list($hash, $account, $date) = $log;
$account = preg_replace('/^Author:/', '', $account);
$account = trim(preg_replace('/<\w+@\w+\.\w+>/', '', $account));
$account = trim(preg_replace('/<[\w\-\.]+@([\w\-]+\.)+\w+>/', '', $account));
$date = trim(preg_replace('/^Date:/', '', $date));
$count = count($log);