Merge branch 'release/2.3.1'

trilbymedia · Apr 30, 2021 · 4fb7d0d · 4fb7d0d
2 parents 0a3a6cf + d513226
commit 4fb7d0d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.3.1
+## 04/30/2021
+
+1. [](#bugfix)
+   * Fixed regression where `testRepository` would erroneously pass with invalid credentials [#200](https://github.com/trilbymedia/grav-plugin-git-sync/issues/200)
+   * Fixed Exception thrown with `bin/plugin git-sync status` command, preventing `sync` [#200](https://github.com/trilbymedia/grav-plugin-git-sync/issues/200)
+
 # v2.3.0
 ## 04/27/2021
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Git Sync
 type: plugin
 slug: git-sync
-version: 2.3.0
+version: 2.3.1
 description: Allows to synchronize portions of Grav with Git Repositories (GitHub, BitBucket, GitLab)
 icon: git
 author:

diff --git a/classes/GitSync.php b/classes/GitSync.php
@@ -481,7 +481,7 @@ public function execute($command, $quiet = false)
                 exec($command, $output, $returnValue);
             }
 
-            if ($returnValue !== 0 && (!empty($output) && $returnValue === 5) && !$quiet) {
+            if ($returnValue !== 0 && $returnValue !== 5 && !$quiet) {
                 throw new \RuntimeException(implode("\r\n", $output));
             }
 

diff --git a/cli/StatusCommand.php b/cli/StatusCommand.php
@@ -90,7 +90,8 @@ protected function serve()
             Helper::prepareRepository(
               $plugin->getUser() ?? '',
               $password,
-              $repository)
+              $repository),
+            $plugin->getRemote('branch', null),
         );
         $this->console_log($testRepository, $password);