Commit 8547138

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"regexp"
 	"runtime/pprof"
 	"strings"
 
@@ -14,13 +13,7 @@ import (
 	flag "github.com/spf13/pflag"
 )
 
-var (
-	flagOwner         string
-	flagName          string
-	flagOutput        string
-	flagBranches      string
-	flagDefaultBranch string
-)
+var flagOutput string
 
 func main() {
 	if _, ok := os.LookupEnv("GITMAL_PPROF"); ok {
@@ -45,11 +38,7 @@ func main() {
 	_, noFiles := os.LookupEnv("NO_FILES")
 	_, noCommitsList := os.LookupEnv("NO_COMMITS_LIST")
 
-	flag.StringVar(&flagOwner, "owner", "", "Project owner")
-	flag.StringVar(&flagName, "name", "", "Project name")
-	flag.StringVar(&flagOutput, "output", "output", "Output directory for generated HTML files")
-	flag.StringVar(&flagBranches, "branches", "", "Regex for branches to include")
-	flag.StringVar(&flagDefaultBranch, "default-branch", "", "Default branch to use (autodetect master or main)")
+	flag.StringVar(&flagOutput, "output", "output", "Output directory")
 	flag.Usage = usage
 	flag.Parse()
 
@@ -73,17 +62,10 @@ func main() {
 	}
 	input = absInput
 
-	if flagName == "" {
-		flagName = filepath.Base(input)
-		flagName = strings.TrimSuffix(flagName, ".git")
-	}
+	name := filepath.Base(input)
+	name = strings.TrimSuffix(name, ".git")
 
-	branchesFilter, err := regexp.Compile(flagBranches)
-	if err != nil {
-		panic(err)
-	}
-
-	branches, err := git.Branches(input, branchesFilter, flagDefaultBranch)
+	branches, err := git.Branches(input)
 	if err != nil {
 		panic(err)
 	}
@@ -93,20 +75,13 @@ func main() {
 		panic(err)
 	}
 
-	if flagDefaultBranch == "" {
-		if generator.ContainsBranch(branches, "master") {
-			flagDefaultBranch = "master"
-		} else if generator.ContainsBranch(branches, "main") {
-			flagDefaultBranch = "main"
-		} else {
-			generator.Echo("No default branch found. Specify one using --default-branch flag.")
-			os.Exit(1)
-		}
-	}
-
-	if !generator.ContainsBranch(branches, flagDefaultBranch) {
-		generator.Echo(fmt.Sprintf("Default branch %q not found.", flagDefaultBranch))
-		generator.Echo("Specify a valid branch using --default-branch flag.")
+	var defaultBranch string
+	if generator.ContainsBranch(branches, "master") {
+		defaultBranch = "master"
+	} else if generator.ContainsBranch(branches, "main") {
+		defaultBranch = "main"
+	} else {
+		generator.Echo("No default branch found (expected 'main' or 'master').")
 		os.Exit(1)
 	}
 
@@ -116,11 +91,10 @@ func main() {
 	}
 
 	params := generator.Params{
-		Owner:      flagOwner,
-		Name:       flagName,
+		Name:       name,
 		RepoDir:    input,
 		OutputDir:  outputDir,
-		DefaultRef: git.NewRef(flagDefaultBranch),
+		DefaultRef: git.NewRef(defaultBranch),
 	}
 
 	commits := make(map[string]git.Commit)
@@ -156,7 +130,7 @@ func main() {
 
 	generator.Echo(fmt.Sprintf("> %s: %d branches, %d tags, %d commits", params.Name, len(branches), len(tags), len(commits)))
 
-	if err := generator.GenerateBranches(branches, flagDefaultBranch, params); err != nil {
+	if err := generator.GenerateBranches(branches, defaultBranch, params); err != nil {
 		panic(err)
 	}
 
@@ -176,7 +150,7 @@ func main() {
 				panic(err)
 			}
 
-			if branch.String() == flagDefaultBranch {
+			if branch.String() == defaultBranch {
 				defaultBranchFiles = files
 			}
 
@@ -204,7 +178,7 @@ func main() {
 		}
 	}
 
-	params.Ref = git.NewRef(flagDefaultBranch)
+	params.Ref = git.NewRef(defaultBranch)
 
 	generator.Echo("> generating commits...")
 	if err := generator.GenerateCommits(commits, params); err != nil {

@@ -3,7 +3,6 @@ package generator
 import "mokhan.ca/antonmedv/gitmal/internal/git"
 
 type Params struct {
-	Owner      string
 	Name       string
 	RepoDir    string
 	Ref        git.Ref

@@ -6,13 +6,12 @@ import (
 	"io"
 	"os/exec"
 	"path/filepath"
-	"regexp"
 	"strconv"
 	"strings"
 	"time"
 )
 
-func Branches(repoDir string, filter *regexp.Regexp, defaultBranch string) ([]Ref, error) {
+func Branches(repoDir string) ([]Ref, error) {
 	cmd := exec.Command("git", "for-each-ref", "--format=%(refname:short)", "refs/heads/")
 	if repoDir != "" {
 		cmd.Dir = repoDir
@@ -27,10 +26,6 @@ func Branches(repoDir string, filter *regexp.Regexp, defaultBranch string) ([]Re
 		if line == "" {
 			continue
 		}
-
-		if filter != nil && !filter.MatchString(line) && line != defaultBranch {
-			continue
-		}
 		branches = append(branches, NewRef(line))
 	}
 	return branches, nil