Merge pull request magento#749 from omiroshnichenko/patch-1

Clone only latest commit in case branch checkout

Author: shiftedreality

src/Command/Dev/UpdateComposer/ComposerGenerator.php

@@ -122,15 +122,24 @@ public function getInstallFromGitScripts(array $repoOptions): array
         $installFromGitScripts[] = 'rm -rf ' . implode(' ', array_keys($repoOptions));
 
         foreach ($repoOptions as $repoName => $gitOption) {
-            $gitRef = $gitOption['ref'] ?? $gitOption['branch'];
-            $installFromGitScripts[] = sprintf(
-                'git clone %s "%s" && git --git-dir="%s/.git" --work-tree="%s" checkout %s',
-                $gitOption['repo'],
-                $repoName,
-                $repoName,
-                $repoName,
-                $gitRef
-            );
+            if (!empty($gitOption['ref'])) {
+                $script = sprintf(
+                    'git clone %s "%s" && git --git-dir="%s/.git" --work-tree="%s" checkout %s',
+                    $gitOption['repo'],
+                    $repoName,
+                    $repoName,
+                    $repoName,
+                    $gitOption['ref']
+                );
+            } else {
+                $script = sprintf(
+                    'git clone -b %s --single-branch --depth 1 %s %s',
+                    $gitOption['branch'],
+                    $gitOption['repo'],
+                    $repoName
+                );
+            }
+            $installFromGitScripts[] = $script;
         }
 
         return $installFromGitScripts;

src/Test/Unit/Command/Dev/UpdateComposer/ComposerGeneratorTest.php

@@ -29,15 +29,17 @@ class ComposerGeneratorTest extends TestCase
         ],
         'repo2' => [
             'repo' => 'path_to_repo2',
+            'ref' => '',
             'branch' => '2.0.0',
         ],
         'repo3' => [
             'repo' => 'path_to_repo3',
+            'ref' => 'test',
             'branch' => '3.0.0',
         ],
         'repo4' => [
             'repo' => 'path_to_repo4',
-            'branch' => '4.0.0',
+            'ref' => 'test',
         ]
     ];
 
@@ -105,10 +107,10 @@ private function assertInstallFromGitScripts(array $actual): void
             [
                 'php -r"@mkdir(__DIR__ . \'/app/etc\', 0777, true);"',
                 'rm -rf repo1 repo2 repo3 repo4',
-                'git clone path_to_repo1 "repo1" && git --git-dir="repo1/.git" --work-tree="repo1" checkout 1.0.0',
-                'git clone path_to_repo2 "repo2" && git --git-dir="repo2/.git" --work-tree="repo2" checkout 2.0.0',
-                'git clone path_to_repo3 "repo3" && git --git-dir="repo3/.git" --work-tree="repo3" checkout 3.0.0',
-                'git clone path_to_repo4 "repo4" && git --git-dir="repo4/.git" --work-tree="repo4" checkout 4.0.0',
+                'git clone -b 1.0.0 --single-branch --depth 1 path_to_repo1 repo1',
+                'git clone -b 2.0.0 --single-branch --depth 1 path_to_repo2 repo2',
+                'git clone path_to_repo3 "repo3" && git --git-dir="repo3/.git" --work-tree="repo3" checkout test',
+                'git clone path_to_repo4 "repo4" && git --git-dir="repo4/.git" --work-tree="repo4" checkout test',
             ],
             $actual
         );

src/Test/Unit/Command/Dev/UpdateComposer/_files/expected_composer.php

@@ -44,10 +44,10 @@
         'install-from-git' => [
             'php -r"@mkdir(__DIR__ . \'/app/etc\', 0777, true);"',
             'rm -rf repo1 repo2 repo3 repo4',
-            'git clone path_to_repo1 "repo1" && git --git-dir="repo1/.git" --work-tree="repo1" checkout 1.0.0',
-            'git clone path_to_repo2 "repo2" && git --git-dir="repo2/.git" --work-tree="repo2" checkout 2.0.0',
-            'git clone path_to_repo3 "repo3" && git --git-dir="repo3/.git" --work-tree="repo3" checkout 3.0.0',
-            'git clone path_to_repo4 "repo4" && git --git-dir="repo4/.git" --work-tree="repo4" checkout 4.0.0',
+            'git clone -b 1.0.0 --single-branch --depth 1 path_to_repo1 repo1',
+            'git clone -b 2.0.0 --single-branch --depth 1 path_to_repo2 repo2',
+            'git clone path_to_repo3 "repo3" && git --git-dir="repo3/.git" --work-tree="repo3" checkout test',
+            'git clone path_to_repo4 "repo4" && git --git-dir="repo4/.git" --work-tree="repo4" checkout test',
         ],
         'pre-install-cmd' => [
             '@install-from-git',