Load issue before accessing index in merge message (#22822) (#22830)

jolheiser · web-flow · commit 68b908d92a5e · 2023-02-09T16:53:14.000-05:00
Backport #22822 --------- Signed-off-by: jolheiser <john.olheiser@gmail.com>
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -99,6 +99,9 @@ func GetDefaultMergeMessage(baseGitRepo *git.Repository, pr *issues_model.PullRe
 				}
 				for _, ref := range refs {
 					if ref.RefAction == references.XRefActionCloses {
+						if err := ref.LoadIssue(); err != nil {
+							return "", err
+						}
 						closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index))
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,9 @@ func GetDefaultMergeMessage(baseGitRepo git.Repository, pr issues_model.PullRe`
`99`	`99`	`}`
`100`	`100`	`for _, ref := range refs {`
`101`	`101`	`if ref.RefAction == references.XRefActionCloses {`
	`102`	`+ if err := ref.LoadIssue(); err != nil {`
	`103`	`+ return "", err`
	`104`	`+ }`
`102`	`105`	`closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index))`
`103`	`106`	`}`
`104`	`107`	`}`