modify spark git init to support add submodule

Author: qdriven

cmd/git/init.go

@@ -24,8 +24,9 @@ var initCmd = &cobra.Command{
 1. Run 'git init'
 2. Configure git user (name/email)
 3. Add child GitHub repos as git submodules
-4. Create a GitHub remote repository via 'gh repo create'
-5. Generate a .gitignore with common patterns
+4. Generate a .gitignore with common patterns
+5. Create an initial commit
+6. Create a GitHub remote repository via 'gh repo create --push'
 
 The repo name defaults to the current directory name.
 Owner defaults to the 'github-owner' config value in ~/.spark.yaml.`,
@@ -52,12 +53,12 @@ Owner defaults to the 'github-owner' config value in ~/.spark.yaml.`,
 		fmt.Printf("Initializing git repository: %s/%s\n", owner, repoName)
 		fmt.Println()
 
-		fmt.Println("Step 1/5: Running git init...")
+		fmt.Println("Step 1/6: Running git init...")
 		if err := git.InitRepo(repoPath); err != nil {
 			return fmt.Errorf("git init failed: %w", err)
 		}
 
-		fmt.Println("Step 2/5: Configuring git user...")
+		fmt.Println("Step 2/6: Configuring git user...")
 		username := viper.GetString("git.username")
 		email := viper.GetString("git.email")
 		if username != "" && email != "" {
@@ -71,25 +72,30 @@ Owner defaults to the 'github-owner' config value in ~/.spark.yaml.`,
 			fmt.Println("  No git user configured in ~/.spark.yaml. Skipping.")
 		}
 
-		fmt.Println("Step 3/5: Scanning for child GitHub repos to add as submodules...")
+		fmt.Println("Step 3/6: Scanning for child GitHub repos to add as submodules...")
 		if err := git.AddChildReposAsSubmodules(repoPath); err != nil {
 			fmt.Printf("Warning: %v\n", err)
 		}
 
+		fmt.Println("Step 4/6: Generating .gitignore...")
+		if err := git.WriteGitIgnore(repoPath); err != nil {
+			fmt.Printf("Warning: failed to write .gitignore: %v\n", err)
+		} else {
+			fmt.Println("  .gitignore created")
+		}
+
+		fmt.Println("Step 5/6: Creating initial commit...")
+		if err := git.InitialCommit(repoPath, "chore: initial commit via spark git init"); err != nil {
+			fmt.Printf("Warning: initial commit failed: %v\n", err)
+		}
+
 		if !initSkipGh {
-			fmt.Printf("Step 4/5: Creating GitHub remote repository (%s/%s)...\n", owner, repoName)
+			fmt.Printf("Step 6/6: Creating GitHub remote repository (%s/%s)...\n", owner, repoName)
 			if err := git.CreateGitHubRepo(repoPath, owner, repoName, initPrivate); err != nil {
 				return fmt.Errorf("creating GitHub repository failed: %w", err)
 			}
 		} else {
-			fmt.Println("Step 4/5: Skipping GitHub remote creation (--skip-gh)")
-		}
-
-		fmt.Println("Step 5/5: Generating .gitignore...")
-		if err := git.WriteGitIgnore(repoPath); err != nil {
-			fmt.Printf("Warning: failed to write .gitignore: %v\n", err)
-		} else {
-			fmt.Println("  .gitignore created")
+			fmt.Println("Step 6/6: Skipping GitHub remote creation (--skip-gh)")
 		}
 
 		fmt.Println()

internal/git/init.go

@@ -96,6 +96,26 @@ coverage/
 	return os.WriteFile(gitignorePath, []byte(content), 0644)
 }
 
+func InitialCommit(repoPath, message string) error {
+	addCmd := exec.Command("git", "add", ".")
+	addCmd.Dir = repoPath
+	addCmd.Stdout = os.Stdout
+	addCmd.Stderr = os.Stderr
+	if err := addCmd.Run(); err != nil {
+		return fmt.Errorf("failed to stage files: %w", err)
+	}
+
+	commitCmd := exec.Command("git", "commit", "-m", message)
+	commitCmd.Dir = repoPath
+	commitCmd.Stdout = os.Stdout
+	commitCmd.Stderr = os.Stderr
+	if err := commitCmd.Run(); err != nil {
+		return fmt.Errorf("failed to commit: %w", err)
+	}
+
+	return nil
+}
+
 func AddChildReposAsSubmodules(rootPath string) error {
 	entries, err := os.ReadDir(rootPath)
 	if err != nil {