Fix test

go-gitea · May 8, 2022 · 85d7d02 · 85d7d02
1 parent 6cd9bf4
commit 85d7d02
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/docs/content/doc/usage/issue-pull-request-templates.en-us.md b/docs/content/doc/usage/issue-pull-request-templates.en-us.md
@@ -52,7 +52,6 @@ Possible file names for PR default merge message templates:
 - `.gitea/default_merge_message/MANUALLY-MERGED_TEMPLATE.md`
 - `.gitea/default_merge_message/REBASE-UPDATE-ONLY_TEMPLATE.md`
 
-<<<<<<< HEAD
 Possible file names for PR default merge message templates:
 
 - `.gitea/default_merge_message/MERGE_TEMPLATE.md`
@@ -62,8 +61,6 @@ Possible file names for PR default merge message templates:
 - `.gitea/default_merge_message/MANUALLY-MERGED_TEMPLATE.md`
 - `.gitea/default_merge_message/REBASE-UPDATE-ONLY_TEMPLATE.md`
 
-=======
->>>>>>> 6825d43b7 (improve code)
 You can use the following variables enclosed in `${}` inside these templates which follow [os.Expand](https://pkg.go.dev/os#Expand) syntax:
 
 - BaseRepoOwnerName: Base repository owner name of this pull request

diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go
@@ -234,7 +234,7 @@ func handlePull(pullID int64, sha string) {
 		defer baseGitRepo.Close()
 	}
 
-	if err := pull_service.Merge(pr, doer, baseGitRepo, scheduledPRM.MergeStyle, "", scheduledPRM.Message); err != nil {
+	if err := pull_service.Merge(ctx, pr, doer, baseGitRepo, scheduledPRM.MergeStyle, "", scheduledPRM.Message); err != nil {
 		log.Error("pull_service.Merge: %v", err)
 		return
 	}

diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -39,9 +39,6 @@ func GetDefaultMergeMessage(baseGitRepo *git.Repository, pr *models.PullRequest,
 	if err := pr.LoadHeadRepo(); err != nil {
 		return "", err
 	}
-	if pr.HeadRepo == nil {
-		return "", repo_model.ErrRepoNotExist{ID: pr.HeadRepoID}
-	}
 	if err := pr.LoadBaseRepo(); err != nil {
 		return "", err
 	}