Fix executing git commands

shopwareLabs · Feb 6, 2023 · 4528f75 · 4528f75
1 parent 364c29d
commit 4528f75
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 41 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/DirectoryFilterIterator.php b/src/DirectoryFilterIterator.php
@@ -13,7 +13,7 @@ class DirectoryFilterIterator extends \FilterIterator
     /**
      * {@inheritdoc}
      */
-    public function accept()
+    public function accept(): bool
     {
         return $this->isValidDir($this->current());
     }

diff --git a/src/Services/GitUtil.php b/src/Services/GitUtil.php
@@ -47,9 +47,10 @@ public function __construct(OutputInterface $output, GitIdentityEnvironment $git
      */
     public function run($commandline, $timeout = null): string
     {
-        $commandline = 'git ' . $commandline;
+        $command = array_filter(explode(' ', $commandline));
+        array_unshift($command, 'git');
 
-        $process = new Process($commandline, null, $this->gitEnv->getGitEnv());
+        $process = new Process($command, null, $this->gitEnv->getGitEnv());
         $process->setTimeout($timeout ?: $this->timeout);
 
         $output = $this->output; // tmp var needed for php < 5.4