Merge branch 'bug_32099' into 'master'

* Fix bug#32099 See merge request easycorp/zentaopms!6939
2023-02-14 05:03:13 +00:00
parent a9cd5ed97b 397a40f648
commit c31e104d8a
1 changed files with 2 additions and 2 deletions
@@ -159,13 +159,13 @@ class gitModel extends model
            $lastInDB = $this->repo->getLatestCommit($repo->id);

            /* Ignore unsynced branch. */
-            if(empty($lastInDB))
+            if($repo->synced != 1)
            {
                if($printLog) $this->printLog("Please init repo {$repo->name}");
                continue;
            }

-            $version = (int)$lastInDB->commit + 1;
+            $version = isset($lastInDB->commit) ? (int)$lastInDB->commit + 1 : 1;
            $logs    = $this->repo->getUnsyncedCommits($repo);
            $objects = array();
            if(!empty($logs))