Merge conflict fixes.

Author: rossigee

modules/gitrepo/blame.go

@@ -10,11 +10,7 @@ import (
 )
 
 func LineBlame(ctx context.Context, repo Repository, revision, file string, line uint) (string, error) {
-<<<<<<< HEAD
-	return runCmdString(ctx, repo,
-=======
 	return RunCmdString(ctx, repo,
->>>>>>> main
 		gitcmd.NewCommand("blame").
 			AddOptionFormat("-L %d,%d", line, line).
 			AddOptionValues("-p", revision).

modules/gitrepo/command.go

@@ -9,12 +9,6 @@ import (
 	"code.gitea.io/gitea/modules/git/gitcmd"
 )
 
-<<<<<<< HEAD
-func runCmdString(ctx context.Context, repo Repository, cmd *gitcmd.Command) (string, error) {
-	res, _, err := cmd.RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath(repo)})
-	return res, err
-}
-=======
 func RunCmd(ctx context.Context, repo Repository, cmd *gitcmd.Command) error {
 	return cmd.WithDir(repoPath(repo)).WithParentCallerInfo().Run(ctx)
 }
@@ -27,4 +21,3 @@ func RunCmdString(ctx context.Context, repo Repository, cmd *gitcmd.Command) (st
 func RunCmdBytes(ctx context.Context, repo Repository, cmd *gitcmd.Command) ([]byte, []byte, error) {
 	return cmd.WithDir(repoPath(repo)).WithParentCallerInfo().RunStdBytes(ctx)
 }
->>>>>>> main

modules/gitrepo/compare.go

@@ -22,11 +22,7 @@ type DivergeObject struct {
 func GetDivergingCommits(ctx context.Context, repo Repository, baseBranch, targetBranch string) (*DivergeObject, error) {
 	cmd := gitcmd.NewCommand("rev-list", "--count", "--left-right").
 		AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--")
-<<<<<<< HEAD
-	stdout, _, err1 := cmd.RunStdString(ctx, &gitcmd.RunOpts{Dir: repoPath(repo)})
-=======
 	stdout, err1 := RunCmdString(ctx, repo, cmd)
->>>>>>> main
 	if err1 != nil {
 		return nil, err1
 	}

modules/gitrepo/diff.go

@@ -20,11 +20,7 @@ func GetDiffShortStatByCmdArgs(ctx context.Context, repo Repository, trustedArgs
 	// we get:
 	// " 9902 files changed, 2034198 insertions(+), 298800 deletions(-)\n"
 	cmd := gitcmd.NewCommand("diff", "--shortstat").AddArguments(trustedArgs...).AddDynamicArguments(dynamicArgs...)
-<<<<<<< HEAD
-	stdout, err := runCmdString(ctx, repo, cmd)
-=======
 	stdout, err := RunCmdString(ctx, repo, cmd)
->>>>>>> main
 	if err != nil {
 		return 0, 0, 0, err
 	}

routers/api/v1/repo/actions_run.go

@@ -245,7 +245,7 @@ func CancelWorkflowRun(ctx *context.APIContext) {
 		return
 	}
 
-	actions_service.CreateCommitStatus(ctx, jobs...)
+	actions_service.CreateCommitStatusForRunJobs(ctx, jobs[0].Run, jobs...)
 
 	for _, job := range updatedJobs {
 		_ = job.LoadAttributes(ctx)
@@ -342,7 +342,7 @@ func ApproveWorkflowRun(ctx *context.APIContext) {
 		return
 	}
 
-	actions_service.CreateCommitStatus(ctx, jobs...)
+	actions_service.CreateCommitStatusForRunJobs(ctx, jobs[0].Run, jobs...)
 
 	if len(updatedJobs) > 0 {
 		job := updatedJobs[0]
@@ -550,7 +550,7 @@ func rerunJob(ctx *context.APIContext, job *actions_model.ActionRunJob, shouldBl
 		return err
 	}
 
-	actions_service.CreateCommitStatus(ctx, job)
+	actions_service.CreateCommitStatusForRunJobs(ctx, job.Run, job)
 	actions_service.NotifyWorkflowRunStatusUpdateWithReload(ctx, job)
 	notify_service.WorkflowJobStatusUpdate(ctx, job.Run.Repo, job.Run.TriggerUser, job, nil)