Skip to content

Commit bb8cf6c

Browse files
efarrerejoffe
authored andcommitted
Don't update stack for merge (ever)
Do not run `UpdatePullRequests` when running the `merge` subcommand. Suppose we have local commits: `c1`. We do a git spr update and a PR is created for `c1`. We then create local commits `c2` & `c3`. If we run `git spr merge` then the following happens. 1. `c1` got merged 2. PRs are created for `c2` and `c3` The creation of PRs for `c2` and `c3` is both unexpected and undocumented. The use of `git spr merge` only claims to "merge all the pull requests that are mergeable in one shot". If you want to only merge some of the PRs then `git spr merge -c` is still available. If you want to create PRs for `c2` and `c3` then `git spr update` can still be used. Note: This change was inspired by de380f0.
1 parent ced682c commit bb8cf6c

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

cmd/spr/main.go

-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ VERSION: fork of {{.Version}}
190190
stackedpr.MergePullRequests(ctx, &count)
191191
} else {
192192
stackedpr.MergePullRequests(ctx, nil)
193-
stackedpr.UpdatePullRequests(ctx, nil, nil)
194193
}
195194
return nil
196195
},

0 commit comments

Comments
 (0)