pagure

#3654 Make it possible to disable non-FF merges for a project
Merged by pingou. Opened by bkabrda.
bkabrda/pagure settings-no-nonff-merges  into  master

Download 3654.patch

This PR makes it possible to disable non-FF merges on per-project basis. I'll add tests later if someone tells me that this feature makes sense :)

This is an excellent feature. I'm surprised we haven't had it before. This effectively means there can't be "merge commits", right?

Just a query, does this enable the ability for a pull-request to be automatically rebased and then merged? or just disable the ability to merge with a merge commit?

@ryanlerch, it looks like the code just disables the ability to merge with a merge commit. If it did the former, that'd be even better, but I'd want it to trigger a CI run (if any are configured) and have that pass before completing the merge.

Def +1 on this, I'll try to fix jenkins before we merge PRs today :s

@ngompa exactly, this means no more merge commits :)
@ryanlerch this just disables merging for non-FF PRs. I think we could add the ability to do automatic rebase later, that's a great idea!

rebased onto cdb0531a42b8cd76a70584c0f0c2dd255adc3800

1 new commit added

  • Fix the tests for the addition of disable_non_fast-forward_merges

Tests are passing locally, @bkabrda swear he would come up with tests later today, so let's merge for now and hold @bkabrda on his words :)

Pull-Request has been merged by pingou
Metadata
None
No Tags
Static archive. pagure.io was sunset in 2026; this is a read-only snapshot.
Red Hat Logo

Fedora is sponsored by Red Hat. Learn more about the relationship between Red Hat and Fedora »

© Red Hat, Inc. and others.