feat: git push pull integration #8338

linkorb · Feb 20, 2024 · 5ae751b · 5ae751b
1 parent 3a90966
commit 5ae751b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ yarn-error.log
 /.php_cs
 /.php_cs.cache
 ###< friendsofphp/php-cs-fixer ###
+.php-cs-fixer.cache
diff --git a/Services/WikiService.php b/Services/WikiService.php
@@ -305,6 +305,8 @@ public function publishWikiPage(Wiki $wiki, WikiPage $wikiPage, string $username
  $repo->execute('config', 'user.email', $userEmail);
  } else {
  $repo = $this->git->open($path);
+ $repo->execute('config', 'committer.name', $username);
+ $repo->execute('config', 'committer.email', $userEmail);
  }
 
  $path .= '/'.$wiki->getName();
@@ -370,7 +372,11 @@ public function pull(Wiki $wiki)
  $path = $this->gitDirPath;
 
  if (!is_dir($path.'/.git')) {
- return null;
+ $repo = $this->git->init($path, [
+ '--initial-branch=main',
+ ]);
+ } else {
+ $repo = $this->git->open($path);
  }
 
  $repo = $this->git->open($path);