DX-3486: [new] fails for existing git repo (acquia#463)

iainp999 · Mar 8, 2021 · c0fcf54 · c0fcf54
1 parent bf7070f
commit c0fcf54
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Command/NewCommand.php b/src/Command/NewCommand.php
@@ -120,6 +120,10 @@ protected function createProject($project, string $dir): void {
    * @throws \Exception
    */
   protected function initializeGitRepository(string $dir): void {
+    if ($this->localMachineHelper->getFilesystem()->exists(Path::join($dir, '.git'))) {
+      $this->logger->debug('.git directory detected, skipping Git repo initialization');
+      return;
+    }
     $this->localMachineHelper->execute([
       'git',
       'init',

diff --git a/tests/phpunit/src/Commands/NewCommandTest.php b/tests/phpunit/src/Commands/NewCommandTest.php
@@ -54,6 +54,7 @@ public function testNewCommand($project, $directory = 'drupal'): void {
 
     $local_machine_helper = $this->mockLocalMachineHelper();
 
+    $this->mockGetFilesystem($local_machine_helper);
     $this->mockExecuteComposerCreate($this->newProjectDir, $local_machine_helper, $process, $project);
     $this->mockExecuteComposerUpdate($local_machine_helper, $this->newProjectDir, $process);
     $this->mockExecuteGitInit($local_machine_helper, $this->newProjectDir, $process);