fix: add .gitignore entry if missing

Author: grezle

pkg/commands/template/upgrade.go

@@ -145,8 +145,20 @@ func createUpgradeCommand(
 				return fmt.Errorf("failed to get current working directory: %w", err)
 			}
 
+			// Create a gitClient for upgrade process
+			gitClient := template.NewGitClient()
+
+			// Ensure .gitignore entry is present for tempExternal
+			tempExternal := "temp_external"
+			if err := gitClient.EnsureGitignoreEntry(".gitignore", tempExternal); err != nil {
+				return fmt.Errorf("failed to add entry to .gitignore %s: %w", tempExternal, err)
+			}
+			if err := gitClient.Commit(".gitignore", fmt.Sprintf("chore: ensure %s is in .gitignore", tempExternal)); err != nil {
+				return fmt.Errorf("failed to commit entry to .gitignore %s: %w", tempExternal, err)
+			}
+
 			// Ensure parent exists
-			tempParent := filepath.Join(absProjectPath, "temp_external")
+			tempParent := filepath.Join(absProjectPath, tempExternal)
 			if err := os.MkdirAll(tempParent, 0o755); err != nil {
 				return fmt.Errorf("failed to create %s: %w", tempParent, err)
 			}
@@ -187,7 +199,7 @@ func createUpgradeCommand(
 
 			// Fetch main template
 			fetcher := &template.GitFetcher{
-				Client: template.NewGitClient(),
+				Client: gitClient,
 				Logger: *progresslogger.NewProgressLogger(
 					logger,
 					tracker,

pkg/template/git_client.go

@@ -239,3 +239,45 @@ func (g *GitClient) ParseCloneOutput(r io.Reader, rep Reporter, dest string, ref
 	}
 	return nil
 }
+
+func (g *GitClient) EnsureGitignoreEntry(path, entry string) error {
+	// Create .gitignore if missing
+	f, err := os.OpenFile(path, os.O_RDWR|os.O_CREATE, 0o644)
+	if err != nil {
+		return fmt.Errorf("open %s: %w", path, err)
+	}
+	defer f.Close()
+
+	// Check if entry exists
+	scanner := bufio.NewScanner(f)
+	for scanner.Scan() {
+		if strings.TrimSpace(scanner.Text()) == entry {
+			return nil // already present
+		}
+	}
+	if err := scanner.Err(); err != nil {
+		return fmt.Errorf("scan %s: %w", path, err)
+	}
+
+	// Append entry
+	if _, err := f.WriteString("\n" + entry + "\n"); err != nil {
+		return fmt.Errorf("write %s: %w", path, err)
+	}
+	return nil
+}
+
+func (g *GitClient) Commit(file, msg string) error {
+	cmds := [][]string{
+		{"git", "add", file},
+		{"git", "commit", "-m", msg},
+	}
+
+	for _, args := range cmds {
+		cmd := exec.Command(args[0], args[1:]...)
+		out, err := cmd.CombinedOutput()
+		if err != nil {
+			return fmt.Errorf("%s failed: %v\n%s", strings.Join(args, " "), err, string(out))
+		}
+	}
+	return nil
+}