Skip to content
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.

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

spr did not close pr's after merge #414

Open
dekimsey opened this issue Jul 19, 2024 · 0 comments
Open

spr did not close pr's after merge #414

dekimsey opened this issue Jul 19, 2024 · 0 comments
Labels
bug Something isn't working

Comments

@dekimsey
Copy link

Recently using spr and found that after managing my stack and getting it ready it failed to close/merge all PR's.

Process:

  1. Check status
$ git spr status
▸ git spr status
> git rev-parse --show-toplevel
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color

 ┌─ github checks pass
 │ ┌── pull request approved
 │ │ ┌─── no merge conflicts
 │ │ │ ┌──── stack check
 │ │ │ │
[✅✅✅✅] https://github.com/dekimsey/example/pull/79 : Cool PR 7
[✅✅✅✅] https://github.com/dekimsey/example/pull/78 : Cooler PR 6
[✅✅✅✅] https://github.com/dekimsey/example/pull/77 : Cooled PR 5
[✅✅✅✅] https://github.com/dekimsey/example/pull/76 : Coolest PR 4
[✅✅✅✅] https://github.com/dekimsey/example/pull/75 : Colder PR 3
[✅✅✅✅] https://github.com/dekimsey/example/pull/74 : Freezing PR 2
[✅✅✅✅] https://github.com/dekimsey/example/pull/73 : Frozen PR 1
  1. Run check
$ git spr check
> git rev-parse --show-toplevel
> git log --format=medium --no-color origin/main..HEAD
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
MergeCheck PASSED
  1. Merge!
$ git spr merge
> git rev-parse --show-toplevel
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
> git log --format=medium --no-color origin/main..HEAD
> github update 79 : Add logging initialization to root cmd
> github merge 79 : Add logging initialization to root cmd
MERGED ⚠️ https://github.com/dekimsey/example/pull/79 : Cool PR 7
> git fetch
> git rebase origin/main --autostash
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
> git log --format=medium --no-color origin/main..HEAD
> git status --porcelain --untracked-files=no
> git stash
> git stash pop
> github fetch pull requests
> git log --format=medium --no-color origin/main..HEAD
> git branch --no-color
pull request stack is empty
  1. All previous PR's are still open untouched, no error. It's not clear to me where the ball is dropped here.

Configuration:

repository config
# git rebase --exec 'make go/test' origin/main
githubRepoOwner: dekimsey
githubRepoName: example
githubHost: github.com
githubRemote: origin
githubBranch: main
requireChecks: true
requireApproval: true
mergeMethod: rebase
mergeQueue: true
mergeCheck: true
forceFetchTags: false
showPrTitlesInStack: true
branchPushIndividually: false

Note: it's possibly my token is the problem, but I couldn't find docs on what privileges it needs so I guessed pull_request and repo content related access and that's appeared to work fine.

@chriscz chriscz added the bug Something isn't working label Sep 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants