code.gitea.io/gitea@v1.21.7/services/pull/merge_merge.go (about)

     1  // Copyright 2023 The Gitea Authors. All rights reserved.
     2  // SPDX-License-Identifier: MIT
     3  
     4  package pull
     5  
     6  import (
     7  	repo_model "code.gitea.io/gitea/models/repo"
     8  	"code.gitea.io/gitea/modules/git"
     9  	"code.gitea.io/gitea/modules/log"
    10  )
    11  
    12  // doMergeStyleMerge merges the tracking into the current HEAD - which is assumed to tbe staging branch (equal to the pr.BaseBranch)
    13  func doMergeStyleMerge(ctx *mergeContext, message string) error {
    14  	cmd := git.NewCommand(ctx, "merge", "--no-ff", "--no-commit").AddDynamicArguments(trackingBranch)
    15  	if err := runMergeCommand(ctx, repo_model.MergeStyleMerge, cmd); err != nil {
    16  		log.Error("%-v Unable to merge tracking into base: %v", ctx.pr, err)
    17  		return err
    18  	}
    19  
    20  	if err := commitAndSignNoAuthor(ctx, message); err != nil {
    21  		log.Error("%-v Unable to make final commit: %v", ctx.pr, err)
    22  		return err
    23  	}
    24  	return nil
    25  }