add clone branch

ArtARTs36 · Aug 19, 2020 · 200bd4a · 200bd4a
1 parent b765c99
commit 200bd4a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Git.php b/src/Git.php
@@ -127,14 +127,26 @@ public function add(string $file): bool
     /**
      * equals: git clone <url> <folder>
      * @param string $url
+     * @param string|null $branch
      * @return bool
      */
-    public function clone(string $url): bool
+    public function clone(string $url, string $branch = null): bool
     {
-        $sh = $this->executeCommand($this->newCommand(FileSystem::belowPath($this->dir))
+        $command = $this->newCommand(FileSystem::belowPath($this->dir))
             ->addParameter('clone')
+            ->when(!empty($branch), function (ShellCommand $command) use ($branch) {
+                $command
+                    ->addCutOption('b')
+                    ->addParameter($branch);
+            })
             ->addParameter($url)
-            ->addParameter($folder = FileSystem::endFolder($this->dir)));
+            ->addParameter($folder = FileSystem::endFolder($this->dir));
+
+        //
+
+        $sh = $this->executeCommand($command);
+
+        //
 
         if (Str::contains($sh, "Cloning into '{$folder}'")) {
             return true;

diff --git a/tests/GitTest.php b/tests/GitTest.php
@@ -129,6 +129,21 @@ public function testClone(): void
             "and is not an empty directory.", $dir)->clone($url);
     }
 
+    /**
+     * @covers \ArtARTs36\GitHandler\Git::clone
+     */
+    public function testCloneBranch(): void
+    {
+        $folder = 'project';
+        $dir = '/var/web/'. $folder;
+        $url = 'http://url.git';
+        $branch = 'dev';
+
+        $git = $this->mock("Cloning into '{$folder}' ...", $dir);
+
+        self::assertTrue($git->clone($url, $branch));
+    }
+
     /**
      * @covers \ArtARTs36\GitHandler\Git::stash
      */