go-gitea
Add merge style `fast-forward-only`
With this option, it is possible to require a linear commit history with the following benefits over the next best option Rebase+fast-forward:
The original commits continue existing, with the original signatures continuing to stay valid instead of being rewritten, there is no merge commit, and reverting commits becomes easier.
Closes #24906
I'm missing the localization for the new UI, but otherwise I think it's close? This is my first contribution so I'm sure I've missed some other things, too. Reviews appreciated!
Oh, by the way: You don't need to force push your branch. We'll squash merge it anyway, so these other commits won't be added to the history, and force pushes make reviewing painful.
~~Addressed the feedback so far, and the integration tests I added are passing. When I test this locally with a repository configured with only fast-forward-only merges allowed, I see the "This branch can be merged automatically" message for an outdated branch, which seems wrong, so I'll look into how to address that...~~ Looked into this, and there is already IsBlockedByOutdatedBranch which is controlled by a separate repository setting. I think it's okay to leave this as-is, but let me know if you disagree.
the integration tests I added are passing
CI disagrees, and says the routes haven't been found.
CI disagrees, and says the routes haven't been found.
Indeed. I ran make integrations.sqlite.test and it passed, but I guess it wasn't clear how to run them. Will fix the errors.
Update: fixed.
I think this is ready to go other than translations. Should I make an attempt at those or is there some other process for doing that?
Ah, forgot to approve. Sorry. No, they will be added automatically from Crowdin once the PR is merged.
![github-actions[bot] avatar](https://avatars.githubusercontent.com/in/15368?v=4 "Published by a pub.dev verified publisher"){kind=small}