Handle deleted HeadRepo in GetDefaultMergeMessage

Signed-off-by: Andrew Thornton <art27@cantab.net>
go-gitea · May 8, 2022 · 6cd9bf4 · 6cd9bf4
1 parent da18a4d
commit 6cd9bf4
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -75,15 +75,19 @@ func GetDefaultMergeMessage(baseGitRepo *git.Repository, pr *models.PullRequest,
 				"BaseRepoOwnerName":      pr.BaseRepo.OwnerName,
 				"BaseRepoName":           pr.BaseRepo.Name,
 				"BaseBranch":             pr.BaseBranch,
-				"HeadRepoOwnerName":      pr.HeadRepo.OwnerName,
-				"HeadRepoName":           pr.HeadRepo.Name,
+				"HeadRepoOwnerName":      "",
+				"HeadRepoName":           "",
 				"HeadBranch":             pr.HeadBranch,
 				"PullRequestTitle":       pr.Issue.Title,
 				"PullRequestDescription": pr.Issue.Content,
 				"PullRequestPosterName":  pr.Issue.Poster.Name,
 				"PullRequestIndex":       strconv.FormatInt(pr.Index, 10),
 				"PullRequestReference":   fmt.Sprintf("%s%d", issueReference, pr.Index),
 			}
+			if pr.HeadRepo != nil {
+				vars["HeadRepoOwnerName"] = pr.HeadRepo.OwnerName
+				vars["HeadRepoName"] = pr.HeadRepo.Name
+			}
 			refs, err := pr.ResolveCrossReferences(baseGitRepo.Ctx)
 			if err == nil {
 				closeIssueIndexes := make([]string, 0, len(refs))
@@ -118,6 +122,10 @@ func GetDefaultMergeMessage(baseGitRepo *git.Repository, pr *models.PullRequest,
 		return fmt.Sprintf("Merge pull request '%s' (%s%d) from %s into %s", pr.Issue.Title, issueReference, pr.Issue.Index, pr.HeadBranch, pr.BaseBranch), nil
 	}
 
+	if pr.HeadRepo == nil {
+		return fmt.Sprintf("Merge pull request '%s' (%s%d) from <deleted>:%s into %s", pr.Issue.Title, issueReference, pr.Issue.Index, pr.HeadBranch, pr.BaseBranch), nil
+	}
+
 	return fmt.Sprintf("Merge pull request '%s' (%s%d) from %s:%s into %s", pr.Issue.Title, issueReference, pr.Issue.Index, pr.HeadRepo.FullName(), pr.HeadBranch, pr.BaseBranch), nil
 }