code.gitea.io/gitea@v1.22.3/services/pull/merge_ff_only.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  // doMergeStyleFastForwardOnly merges the tracking into the current HEAD - which is assumed to be staging branch (equal to the pr.BaseBranch)
    13  func doMergeStyleFastForwardOnly(ctx *mergeContext) error {
    14  	cmd := git.NewCommand(ctx, "merge", "--ff-only").AddDynamicArguments(trackingBranch)
    15  	if err := runMergeCommand(ctx, repo_model.MergeStyleFastForwardOnly, cmd); err != nil {
    16  		log.Error("%-v Unable to merge tracking into base: %v", ctx.pr, err)
    17  		return err
    18  	}
    19  
    20  	return nil
    21  }