mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 14:59:06 +00:00
a1bc2aa05e
Backport #25779 by @wxiaoguang Related #22669. Close #25177 After the fix:  Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
30 lines
1.1 KiB
Go
30 lines
1.1 KiB
Go
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package repo
|
|
|
|
import "code.gitea.io/gitea/models/db"
|
|
|
|
// MergeStyle represents the approach to merge commits into base branch.
|
|
type MergeStyle string
|
|
|
|
const (
|
|
// MergeStyleMerge create merge commit
|
|
MergeStyleMerge MergeStyle = "merge"
|
|
// MergeStyleRebase rebase before merging, and fast-forward
|
|
MergeStyleRebase MergeStyle = "rebase"
|
|
// MergeStyleRebaseMerge rebase before merging with merge commit (--no-ff)
|
|
MergeStyleRebaseMerge MergeStyle = "rebase-merge"
|
|
// MergeStyleSquash squash commits into single commit before merging
|
|
MergeStyleSquash MergeStyle = "squash"
|
|
// MergeStyleManuallyMerged pr has been merged manually, just mark it as merged directly
|
|
MergeStyleManuallyMerged MergeStyle = "manually-merged"
|
|
// MergeStyleRebaseUpdate not a merge style, used to update pull head by rebase
|
|
MergeStyleRebaseUpdate MergeStyle = "rebase-update-only"
|
|
)
|
|
|
|
// UpdateDefaultBranch updates the default branch
|
|
func UpdateDefaultBranch(repo *Repository) error {
|
|
_, err := db.GetEngine(db.DefaultContext).ID(repo.ID).Cols("default_branch").Update(repo)
|
|
return err
|
|
}
|