If a PR gets corrupted it can not be closed via the webinterface of gin, leaving it present, but broken forever. Examples are
- https://gin.g-node.org/NeuralEnsemble/ephy_testing_data/pulls/28
- https://gin.g-node.org/NeuralEnsemble/ephy_testing_data/pulls/32
- https://gin.g-node.org/NeuralEnsemble/ephy_testing_data/pulls/33
This is a little hard to reproduce but it looks like it's already been fixed upstream. I can't give a timeline for when it will land in GIN though.
How were the PRs corrupted exactly? The underlying issue is that the branch being merged doesn't share a merge base with the base branch.
Is it possible to push to the branch for each PR? If you can, force pushing anything that shares a merge base with the base branch should fix the issue and let you load the page to delete and clean them up.
This is a little hard to reproduce but it looks like it's already been fixed upstream. I can't give a timeline for when it will land in GIN though.
How were the PRs corrupted exactly? The underlying issue is that the branch being merged doesn't share a merge base with the base branch.
Is it possible to push to the branch for each PR? If you can, force pushing anything that shares a merge base with the base branch should fix the issue and let you load the page to delete and clean them up.
For reference, the offending code is at:
https://github.com/G-Node/gogs/blob/2716e9bdc2ed6e280562a31edce9f2ac9ff94def/internal/route/repo/pull.go#L219-L230
And the upstream version which handles the issue more gracefully is at:
https://github.com/gogs/gogs/blob/ba8be9489e6d959fa9005fc7d38bf62562580d23/internal/route/repo/pull.go#L535-L537
The corrupted PRs were open when a history reset of the master branch was performed, resulting in the base branch and the PR branch not having shared history.
I think I deleted already the corresponding feature branches, but can not verify this any more as I can't check the PRs parameters via the webinterface any more.
The corrupted PRs were open when a history reset of the master branch was performed, resulting in the base branch and the PR branch not having shared history.
I think I deleted already the corresponding feature branches, but can not verify this any more as I can't check the PRs parameters via the webinterface any more.
If a PR gets corrupted it can not be closed via the webinterface of gin, leaving it present, but broken forever. Examples are
This is a little hard to reproduce but it looks like it's already been fixed upstream. I can't give a timeline for when it will land in GIN though.
How were the PRs corrupted exactly? The underlying issue is that the branch being merged doesn't share a merge base with the base branch. Is it possible to push to the branch for each PR? If you can, force pushing anything that shares a merge base with the base branch should fix the issue and let you load the page to delete and clean them up.
For reference, the offending code is at: https://github.com/G-Node/gogs/blob/2716e9bdc2ed6e280562a31edce9f2ac9ff94def/internal/route/repo/pull.go#L219-L230
And the upstream version which handles the issue more gracefully is at: https://github.com/gogs/gogs/blob/ba8be9489e6d959fa9005fc7d38bf62562580d23/internal/route/repo/pull.go#L535-L537
The corrupted PRs were open when a history reset of the master branch was performed, resulting in the base branch and the PR branch not having shared history. I think I deleted already the corresponding feature branches, but can not verify this any more as I can't check the PRs parameters via the webinterface any more.