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

Merge branch 'lyk_ticket_419' into 'master'

Browse Source 
* Resolve ticket #419.

See merge request easycorp/zentaopms!7072
This commit is contained in:
孙广明
2023-02-27 05:02:16 +00:00
parent 6f8ec51731 03163f1818
commit 0980ac3ac9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/scm/gitea.class.php
+2 -2
View File
@@ -218,8 +218,8 @@ class Gitea
$path = ltrim($path, DIRECTORY_SEPARATOR);
$count = $count == 0 ? '' : "-n $count";
/* compatible with svn. */
if($fromRevision == 'HEAD' and $this->branch) $fromRevision = $this->branch;
if($toRevision == 'HEAD' and $this->branch) $toRevision = $this->branch;
if($fromRevision === 'HEAD' and $this->branch) $fromRevision = $this->branch;
if($toRevision === 'HEAD' and $this->branch) $toRevision = $this->branch;
if($fromRevision === $toRevision)
{
$logs = array();
module/repo/control.php
+1 -1
View File
@@ -1372,7 +1372,7 @@ class repo extends control
$content = file($logFile);
$lastLine = $content[count($content) - 1];
if(!strpos($lastLine, 'done'))
if(strpos($lastLine, 'done') !== false)
{
if(strpos($lastLine, 'empty repository') !== false)
{