mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-04 10:44:12 +01:00
9332ff291b
The name cmd is already used in many places and may cause conflicts, so I chose `gitcmd` instead to minimize potential naming conflicts.
26 lines
868 B
Go
26 lines
868 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/gitcmd"
|
|
"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 := gitcmd.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
|
|
}
|