mirror of https://github.com/go-gitea/gitea.git
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
858 B
25 lines
858 B
// 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" |
|
) |
|
|
|
// doMergeStyleMerge merges the tracking branch into the current HEAD - which is assumed to be the staging branch (equal to the pr.BaseBranch) |
|
func doMergeStyleMerge(ctx *mergeContext, message string) error { |
|
cmd := git.NewCommand("merge", "--no-ff", "--no-commit").AddDynamicArguments(trackingBranch) |
|
if err := runMergeCommand(ctx, repo_model.MergeStyleMerge, cmd); err != nil { |
|
log.Error("%-v Unable to merge tracking into base: %v", ctx.pr, err) |
|
return err |
|
} |
|
|
|
if err := commitAndSignNoAuthor(ctx, message); err != nil { |
|
log.Error("%-v Unable to make final commit: %v", ctx.pr, err) |
|
return err |
|
} |
|
return nil |
|
}
|
|
|