Merge pull request #19 from hmariset/KFLUXVNGD-681

fix: ensure base branch is fetched before creating PR branches

Author: hmariset

internal/discover/runner.go

@@ -318,8 +318,11 @@ func (r *Runner) createPullRequests(ctx context.Context, configs []config.Reposi
 		return fmt.Errorf("failed to get current repository name: %w", err)
 	}
 
-	// Determine base branch (main or master)
-	baseBranch := "main"
+	// Get default branch from GitHub API
+	baseBranch, err := r.getDefaultBranch(ctx, currentRepo)
+	if err != nil {
+		return fmt.Errorf("failed to get default branch: %w", err)
+	}
 
 	// Use writeClient for PR creation (may have different permissions than readClient)
 	prCreator := pr.NewCreator(r.writeClient, workDir, r.config.Organization, currentRepo, baseBranch)
@@ -366,6 +369,21 @@ func (r *Runner) getCurrentRepoName(ctx context.Context) (string, error) {
 	return "", fmt.Errorf("failed to parse repository name from remote URL: %s", remoteURL)
 }
 
+func (r *Runner) getDefaultBranch(ctx context.Context, repoName string) (string, error) {
+	repo, _, err := r.writeClient.Repositories.Get(ctx, r.config.Organization, repoName)
+	if err != nil {
+		return "", fmt.Errorf("failed to get repository info: %w", err)
+	}
+
+	defaultBranch := repo.GetDefaultBranch()
+	if defaultBranch == "" {
+		// Fallback to main if default branch is not set
+		return "main", nil
+	}
+
+	return defaultBranch, nil
+}
+
 func (r *Runner) printSummary(totalRepos, newRepos, created int) {
 	fmt.Println("=========================================")
 	fmt.Println("Discovery Summary")
@@ -412,14 +430,21 @@ func (r *Runner) prAlreadyExists(ctx context.Context, repoName string) bool {
 		return false
 	}
 
+	// Get default branch
+	baseBranch, err := r.getDefaultBranch(ctx, currentRepo)
+	if err != nil {
+		// Fallback to main if we can't determine the default branch
+		baseBranch = "main"
+	}
+
 	// Branch name format matches pr/creator.go
 	branchName := fmt.Sprintf("add-repo/%s", repoName)
 
 	// Check if PR exists with this branch as head
 	opts := &github.PullRequestListOptions{
 		State: "open",
 		Head:  fmt.Sprintf("%s:%s", r.config.Organization, branchName),
-		Base:  "main",
+		Base:  baseBranch,
 	}
 
 	prs, _, err := r.writeClient.PullRequests.List(ctx, r.config.Organization, currentRepo, opts)

internal/pr/creator.go

@@ -97,8 +97,8 @@ func (c *Creator) CreatePullRequest(ctx context.Context, cfg config.RepositoryCo
 		return fmt.Errorf("GitHub API error: %w", err)
 	}
 
-	// 5. Return to base branch for next iteration (handles CI environment)
-	if _, err := RunGitCommand(ctx, c.workDir, "checkout", "-B", c.baseBranch, "origin/"+c.baseBranch); err != nil {
+	// 5. Return to base branch for next iteration
+	if _, err := RunGitCommand(ctx, c.workDir, "checkout", c.baseBranch); err != nil {
 		fmt.Printf("    ⚠️  Warning: failed to checkout %s: %v\n", c.baseBranch, err)
 	}
 
@@ -113,10 +113,33 @@ func (c *Creator) createBranch(ctx context.Context, branchName string) error {
 		}
 	}
 
-	// Checkout base branch - create/reset from origin if needed (handles CI environment)
-	// Using -B ensures the branch is created from origin/base if it doesn't exist locally
-	if _, err := RunGitCommand(ctx, c.workDir, "checkout", "-B", c.baseBranch, "origin/"+c.baseBranch); err != nil {
-		return err
+	// Try to fetch the base branch from origin
+	// If this fails, we'll try to use the local branch if it exists
+	fetchSucceeded := false
+	if _, err := RunGitCommand(ctx, c.workDir, "fetch", "origin", c.baseBranch); err == nil {
+		fetchSucceeded = true
+	}
+
+	// Check if base branch exists locally
+	baseExistsLocally := c.branchExists(ctx, c.baseBranch)
+
+	if !baseExistsLocally && !fetchSucceeded {
+		// Can't proceed without either local branch or successful fetch
+		return fmt.Errorf("base branch %s does not exist locally and fetch from origin failed", c.baseBranch)
+	}
+
+	if fetchSucceeded {
+		// Create/reset local branch to match FETCH_HEAD (latest from remote)
+		// -B creates the branch if it doesn't exist, or resets it if it does
+		if _, err := RunGitCommand(ctx, c.workDir, "checkout", "-B", c.baseBranch, "FETCH_HEAD"); err != nil {
+			return fmt.Errorf("failed to setup base branch %s from remote: %w", c.baseBranch, err)
+		}
+	} else {
+		// Fetch failed but local branch exists - use local copy
+		if _, err := RunGitCommand(ctx, c.workDir, "checkout", c.baseBranch); err != nil {
+			return fmt.Errorf("failed to checkout base branch %s: %w", c.baseBranch, err)
+		}
+		fmt.Printf("    ⚠️  Warning: using local %s branch (fetch failed)\n", c.baseBranch)
 	}
 
 	// Create and checkout new branch