diff options
| author | Chris Copeland <chris@chrisnc.net> | 2024-02-12 14:37:23 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-12 23:37:23 +0100 |
| commit | 47b59658629f47e0ac559559a305b867740cae9c (patch) | |
| tree | 5bc0102a155565f1b813609082d9ae23712e0d65 /services/forms | |
| parent | f9c3459831659d37fd885dd1a9db32dcf19420e4 (diff) | |
| download | gitea-47b59658629f47e0ac559559a305b867740cae9c.tar.gz gitea-47b59658629f47e0ac559559a305b867740cae9c.zip | |
Add merge style `fast-forward-only` (#28954)
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
Diffstat (limited to 'services/forms')
| -rw-r--r-- | services/forms/repo_form.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/forms/repo_form.go b/services/forms/repo_form.go index 845eccf817..60fa0ab363 100644 --- a/services/forms/repo_form.go +++ b/services/forms/repo_form.go @@ -151,6 +151,7 @@ type RepoSettingForm struct { PullsAllowRebase bool PullsAllowRebaseMerge bool PullsAllowSquash bool + PullsAllowFastForwardOnly bool PullsAllowManualMerge bool PullsDefaultMergeStyle string EnableAutodetectManualMerge bool @@ -598,8 +599,8 @@ func (f *InitializeLabelsForm) Validate(req *http.Request, errs binding.Errors) // swagger:model MergePullRequestOption type MergePullRequestForm struct { // required: true - // enum: merge,rebase,rebase-merge,squash,manually-merged - Do string `binding:"Required;In(merge,rebase,rebase-merge,squash,manually-merged)"` + // enum: merge,rebase,rebase-merge,squash,fast-forward-only,manually-merged + Do string `binding:"Required;In(merge,rebase,rebase-merge,squash,fast-forward-only,manually-merged)"` MergeTitleField string MergeMessageField string MergeCommitID string // only used for manually-merged |