Skip to content

Print error message if no mergeable changes detected #475

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
ejoffe merged 1 commit into from
Jan 12, 2026
Merged

Print error message if no mergeable changes detected #475

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
12 changes: 6 additions & 6 deletions spr/spr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (

// NewStackedPR constructs and returns a new stackediff instance.
func NewStackedPR(config *config.Config, github github.GitHubInterface, gitcmd git.GitInterface) *stackediff {

return &stackediff{
config: config,
github: github,
Expand Down Expand Up @@ -87,7 +86,8 @@ func (sd *stackediff) AmendCommit(ctx context.Context) {
}

func (sd *stackediff) addReviewers(ctx context.Context,
pr *github.PullRequest, reviewers []string, assignable []github.RepoAssignee) {
pr *github.PullRequest, reviewers []string, assignable []github.RepoAssignee,
) {
userIDs := make([]string, 0, len(reviewers))
for _, r := range reviewers {
found := false
Expand All @@ -106,7 +106,7 @@ func (sd *stackediff) addReviewers(ctx context.Context,
}

func alignLocalCommits(commits []git.Commit, prs []*github.PullRequest) []git.Commit {
var remoteCommits = map[string]bool{}
remoteCommits := map[string]bool{}
for _, pr := range prs {
for _, c := range pr.Commits {
remoteCommits[c.CommitID] = c.CommitID == pr.Commit.CommitID
Expand Down Expand Up @@ -317,6 +317,7 @@ func (sd *stackediff) MergePullRequests(ctx context.Context, count *uint) {
prIndex--
}
if prIndex == -1 {
check(errors.New("no mergeable pull requests found in the stack"))
return
}
prToMerge := githubInfo.PullRequests[prIndex]
Expand Down Expand Up @@ -441,7 +442,6 @@ func (sd *stackediff) RunMergeCheck(ctx context.Context) {
}()

err = cmd.Wait()

if err != nil {
sd.config.State.MergeCheckCommit[githubInfo.Key()] = ""
rake.LoadSources(sd.config.State,
Expand Down Expand Up @@ -523,8 +523,8 @@ func (sd *stackediff) fetchAndGetGitHubInfo(ctx context.Context) *github.GitHubI
// which are new (on top of remote branch) and creates a corresponding
// branch on github for each commit.
func (sd *stackediff) syncCommitStackToGitHub(ctx context.Context,
commits []git.Commit, info *github.GitHubInfo) bool {

commits []git.Commit, info *github.GitHubInfo,
) bool {
var output string
sd.gitcmd.MustGit("status --porcelain --untracked-files=no", &output)
if output != "" {
Expand Down
Loading