mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-22 13:45:19 +00:00
22 lines
712 B
Go
22 lines
712 B
Go
|
// Copyright 2023 The Gitea Authors. All rights reserved.
|
||
|
|
// SPDX-License-Identifier: MIT
|
||
|
|
|
||
|
|
package pull
|
||
|
|
|
||
|
|
import (
|
||
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
||
|
|
"code.gitea.io/gitea/modules/git"
|
||
|
|
"code.gitea.io/gitea/modules/log"
|
||
|
|
)
|
||
|
|
|
||
|
|
// doMergeStyleFastForwardOnly merges the tracking into the current HEAD - which is assumed to be staging branch (equal to the pr.BaseBranch)
|
||
|
|
func doMergeStyleFastForwardOnly(ctx *mergeContext) error {
|
||
|
|
cmd := git.NewCommand(ctx, "merge", "--ff-only").AddDynamicArguments(trackingBranch)
|
||
|
|
if err := runMergeCommand(ctx, repo_model.MergeStyleFastForwardOnly, cmd); err != nil {
|
||
|
|
log.Error("%-v Unable to merge tracking into base: %v", ctx.pr, err)
|
||
|
|
return err
|
||
|
|
}
|
||
|
|
|
||
|
|
return nil
|
||
|
|
}
|