Skip to content

fix: rebase PR git error #16

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
andrinoff merged 1 commit into from
Jul 9, 2026
Merged

fix: rebase PR git error #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 5 additions & 35 deletions cli_rebase.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,47 +108,16 @@ func defaultBranchForRemote(remote string) (string, error) {
return branch, nil
}

// rebaseUpstream determines the upstream ref to rebase onto and runs the
// rebase. It fetches the target remote first.
//
// Logic:
// 1. Find the current branch's configured upstream (e.g. origin/main).
// 2. If upstream exists, fetch that remote and rebase onto upstream ref.
// 3. If no upstream, fall back to the current remote's default branch.
// rebaseUpstream rebases the current branch onto the remote's default branch
// (e.g. origin/main). It fetches the remote first.
func rebaseUpstream() error {
branch, err := currentBranch()
if err != nil {
return err
}

// Try configured upstream for the current branch.
upstream, _ := gitOutput("rev-parse", "--abbrev-ref", branch+"@{u}")

if upstream != "" {
// upstream is like "origin/main"
parts := strings.SplitN(upstream, "/", 2)
remote := parts[0]
if len(parts) < 2 {
return fmt.Errorf("unexpected upstream format: %s", upstream)
}

if !remoteExists(remote) {
return fmt.Errorf("upstream remote %q does not exist", remote)
}

fmt.Fprintf(os.Stderr, "Fetching %s...\n", remote)
if err := gitRun("fetch", remote); err != nil {
return fmt.Errorf("fetch %s: %w", remote, err)
}

fmt.Fprintf(os.Stderr, "Rebasing %s onto %s...\n", branch, upstream)
return gitRun("rebase", upstream)
}

// No upstream configured. Fall back to current remote's default branch.
remote := "origin"
if !remoteExists(remote) {
// Pick the first available remote.
out, err := gitOutput("remote")
if err != nil || out == "" {
return fmt.Errorf("no remotes configured")
Expand Down Expand Up @@ -180,10 +149,11 @@ func rebasePR(number int) error {
}

// Find the PR's head branch name.
out, err := gitOutput("gh", "pr", "view", strconv.Itoa(number), "--json", "headRefName")
prOut, err := exec.Command("gh", "pr", "view", strconv.Itoa(number), "--json", "headRefName").Output()
if err != nil {
return fmt.Errorf("gh pr view %d: %w", number, err)
}
out := strings.TrimSpace(string(prOut))
branch := parseJSONField(out, "headRefName")
if branch == "" {
return fmt.Errorf("could not determine PR branch name from gh output")
Expand All @@ -202,7 +172,7 @@ func rebasePR(number int) error {
return fmt.Errorf("checkout %s: %w", branch, err)
}

fmt.Fprintln(os.Stderr, "Rebasing onto upstream...")
fmt.Fprintf(os.Stderr, "Rebasing %s onto upstream...\n", branch)
if err := rebaseUpstream(); err != nil {
return err
}
Expand Down
Loading