Skip to content

fix: restore stackparent config after cherry-pick rebuild #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
javoire merged 2 commits into from
Dec 22, 2025
Merged

fix: restore stackparent config after cherry-pick rebuild #41

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01837a1
feat: add --cherry-pick flag to auto-rebuild polluted branches
javoire Dec 19, 2025
dd333fb
fix: restore stackparent config after cherry-pick rebuild
javoire Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion cmd/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,9 +603,14 @@ func runSync(gitClient git.GitClient, githubClient github.GitHubClient) error {

if syncCherryPick {
// Automated cherry-pick rebuild with backup
backupBranch := branch.Name + "-backup"
tempBranch := branch.Name + "-rebuild"

// Find available backup branch name
backupBranch := branch.Name + "-backup"
for i := 2; gitClient.BranchExists(backupBranch); i++ {
backupBranch = fmt.Sprintf("%s-backup-%d", branch.Name, i)
}

fmt.Printf("\n")
fmt.Printf("⚠ Detected polluted branch history (%d commits, %d unique patches)\n", len(allCommits), len(uniqueCommits))
fmt.Printf(" Creating backup: %s\n", backupBranch)
Expand Down Expand Up @@ -657,6 +662,12 @@ func runSync(gitClient git.GitClient, githubClient github.GitHubClient) error {
return fmt.Errorf("failed to rename temp branch: %w", err)
}

// Restore stackparent config (git branch -D deletes the branch's config section)
configKey := fmt.Sprintf("branch.%s.stackparent", branch.Name)
if err := gitClient.SetConfig(configKey, branch.Parent); err != nil {
return fmt.Errorf("failed to restore stackparent config: %w", err)
}

fmt.Printf("✓ Rebuilt %s (backup saved as %s)\n", branch.Name, backupBranch)
fmt.Printf(" To delete backup later: git branch -D %s\n", backupBranch)

Expand Down