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 /modules/repository/create.go | |
| 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 'modules/repository/create.go')
| -rw-r--r-- | modules/repository/create.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/repository/create.go b/modules/repository/create.go index 7c954a1412..ca2150b972 100644 --- a/modules/repository/create.go +++ b/modules/repository/create.go @@ -87,7 +87,11 @@ func CreateRepositoryByExample(ctx context.Context, doer, u *user_model.User, re units = append(units, repo_model.RepoUnit{ RepoID: repo.ID, Type: tp, - Config: &repo_model.PullRequestsConfig{AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true, DefaultMergeStyle: repo_model.MergeStyle(setting.Repository.PullRequest.DefaultMergeStyle), AllowRebaseUpdate: true}, + Config: &repo_model.PullRequestsConfig{ + AllowMerge: true, AllowRebase: true, AllowRebaseMerge: true, AllowSquash: true, AllowFastForwardOnly: true, + DefaultMergeStyle: repo_model.MergeStyle(setting.Repository.PullRequest.DefaultMergeStyle), + AllowRebaseUpdate: true, + }, }) } else { units = append(units, repo_model.RepoUnit{ |