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

jolheiser · web-flow · commit 4dd7d61ac8c8 · 2023-02-09T10:47:52.000+08:00
Fixes #22821 Signed-off-by: jolheiser <john.olheiser@gmail.com>
diff --git a/services/pull/merge.go b/services/pull/merge.go
@@ -98,6 +98,9 @@ func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr
 				}
 				for _, ref := range refs {
 					if ref.RefAction == references.XRefActionCloses {
+						if err := ref.LoadIssue(ctx); 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
`@@ -98,6 +98,9 @@ func GetDefaultMergeMessage(ctx context.Context, baseGitRepo *git.Repository, pr`
`98`	`98`	`}`
`99`	`99`	`for _, ref := range refs {`
`100`	`100`	`if ref.RefAction == references.XRefActionCloses {`
	`101`	`+ if err := ref.LoadIssue(ctx); err != nil {`
	`102`	`+ return "", "", err`
	`103`	`+ }`
`101`	`104`	`closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index))`
`102`	`105`	`}`
`103`	`106`	`}`