Merge pull request #115 from nunocoracao/fix/issue-81-subdirectory-git

Fix #81: Detect existing git repo in parent directories

Author: nunocoracao

src/flow.js

@@ -150,9 +150,38 @@ export default class flow {
     hugospinner.succeed('Hugo site created');
 
     var precommand = 'cd ' + response.directory + ' && ';
-    const gitspinner = ora('Initializing Git').start();
-    await utils.run(precommand + 'git init', false)
-    gitspinner.succeed('Git initialized');
+
+    // Check if there's an existing git repo in parent directories
+    const existingGitRepo = utils.findGitRepoInParents(process.cwd());
+    let skipGitInit = false;
+
+    if (existingGitRepo) {
+      console.log(chalk.yellow('\nFound existing Git repository at: ' + existingGitRepo));
+      const gitChoice = await safePrompt({
+        type: 'select',
+        name: 'option',
+        message: 'How would you like to handle Git?',
+        choices: [
+          'Use existing repository (recommended for subdirectories)',
+          'Create new repository in ' + response.directory
+        ]
+      });
+
+      if (!gitChoice) {
+        flow.showMain();
+        return;
+      }
+
+      skipGitInit = gitChoice.option.includes('Use existing');
+    }
+
+    if (!skipGitInit) {
+      const gitspinner = ora('Initializing Git').start();
+      await utils.run(precommand + 'git init', false)
+      gitspinner.succeed('Git initialized');
+    } else {
+      console.log(chalk.green('✔ Using existing Git repository'));
+    }
 
     const blowfishspinner = ora('Installing Blowfish').start();
     const submoduleExitCode = await utils.run(precommand + 'git submodule add --depth 1 -b main https://github.com/nunocoracao/blowfish.git themes/blowfish', false, true);
@@ -241,9 +270,38 @@ export default class flow {
     hugospinner.succeed('Template cloned');
 
     var precommand = 'cd ' + response.directory + ' && ';
-    const gitspinner = ora('Initializing Git').start();
-    await utils.run(precommand + 'git init', false)
-    gitspinner.succeed('Git initialized');
+
+    // Check if there's an existing git repo in parent directories
+    const existingGitRepo = utils.findGitRepoInParents(process.cwd());
+    let skipGitInit = false;
+
+    if (existingGitRepo) {
+      console.log(chalk.yellow('\nFound existing Git repository at: ' + existingGitRepo));
+      const gitChoice = await safePrompt({
+        type: 'select',
+        name: 'option',
+        message: 'How would you like to handle Git?',
+        choices: [
+          'Use existing repository (recommended for subdirectories)',
+          'Create new repository in ' + response.directory
+        ]
+      });
+
+      if (!gitChoice) {
+        flow.showMain();
+        return;
+      }
+
+      skipGitInit = gitChoice.option.includes('Use existing');
+    }
+
+    if (!skipGitInit) {
+      const gitspinner = ora('Initializing Git').start();
+      await utils.run(precommand + 'git init', false)
+      gitspinner.succeed('Git initialized');
+    } else {
+      console.log(chalk.green('✔ Using existing Git repository'));
+    }
 
     const blowfishspinner = ora('Installing Blowfish').start();
     await utils.directoryDelete(response.directory + '/themes/blowfish')

src/utils.js

@@ -134,15 +134,30 @@ export default class utils {
     fs.writeFileSync(path, result, 'utf8')
   }
 
-  static directoryExists(path) {
+  static directoryExists(dirPath) {
     try {
-      return fs.existsSync(path);
+      return fs.existsSync(dirPath);
     } catch (err) {
       console.log(err)
       return false;
     }
   }
 
+  static findGitRepoInParents(startPath) {
+    // Check if there's a .git folder in any parent directory
+    let currentPath = path.resolve(startPath);
+    const root = path.parse(currentPath).root;
+
+    while (currentPath !== root) {
+      const gitPath = path.join(currentPath, '.git');
+      if (fs.existsSync(gitPath)) {
+        return currentPath;
+      }
+      currentPath = path.dirname(currentPath);
+    }
+    return null;
+  }
+
   static directoryIsEmpty(path) {
     try {
       const files = fs.readdirSync(path);