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

Automerge doesn't respect branch deletion rule #32341

Open
friedrichsenm opened this issue Oct 25, 2024 · 3 comments · May be fixed by #32343
Open

Automerge doesn't respect branch deletion rule #32341

friedrichsenm opened this issue Oct 25, 2024 · 3 comments · May be fixed by #32343
Labels
Milestone

Comments

@friedrichsenm
Copy link

Description

If your repository is configured to automatically delete a PR branch when it is merged but you use (for instance) "Fast Forward Only (after checks succeed)" to schedule an automerge of the branch after branch protection rules pass, then the PR branch will not be automatically deleted when the PR is merged.

Gitea Version

1.22.2

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

No response

Git Version

No response

Operating System

No response

How are you running Gitea?

Being run from rootless docker image

Database

PostgreSQL

@lunny lunny linked a pull request Oct 26, 2024 that will close this issue
3 tasks
@lunny lunny added this to the 1.23.0 milestone Oct 26, 2024
@SoulSeekkor
Copy link

Not sure if this is related, I've noticed after upgrading to 1.22.3 (probably happened in an earlier release, we didn't use branches often before) that the merge PR does not delete the branch like it's supposed to. My question on the related side of things, is I've noticed I'm unable to delete a branch in any way it seems, did something change with a later release that would be preventing this? For example when going to the branches list on a repo, there used to be a delete button and it's just not there for me anymore. I can't even delete the branches remotely. This is true even on repos with no branch branches at all (as far as the button being missing from the branches page at least).

@lunny
Copy link
Member

lunny commented Nov 11, 2024

Not sure if this is related, I've noticed after upgrading to 1.22.3 (probably happened in an earlier release, we didn't use branches often before) that the merge PR does not delete the branch like it's supposed to. My question on the related side of things, is I've noticed I'm unable to delete a branch in any way it seems, did something change with a later release that would be preventing this? For example when going to the branches list on a repo, there used to be a delete button and it's just not there for me anymore. I can't even delete the branches remotely. This is true even on repos with no branch branches at all (as far as the button being missing from the branches page at least).

Can you reproduce this on demo site?

@SoulSeekkor
Copy link

Seems the demo site is down/unreachable for me at the moment. I have narrowed this down to something having changed in branch protections, we have a '**' protection in place to require signed commits and that breaks Gitea doing branch deletion on merge along with the ability to delete them from the GUI. Seems branch deletion got thrown in there without a new option being added to branch protections to allow for that?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants