From a4646623b446359a7d9d701d0992759034dac74d Mon Sep 17 00:00:00 2001 From: John Olheiser Date: Wed, 8 Feb 2023 20:47:52 -0600 Subject: [PATCH 1/2] Load issue before accessing index in merge message (#22822) Fixes #22821 Signed-off-by: jolheiser --- services/pull/merge.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/pull/merge.go b/services/pull/merge.go index ddfac5a219959..83522dae0fb04 100644 --- 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(ctx); err != nil { + return "", "", err + } closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index)) } } From 20628b596c333b90b96eb1199437b924c109b664 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Thu, 9 Feb 2023 08:41:21 -0600 Subject: [PATCH 2/2] fix: remove new changes from backport Signed-off-by: jolheiser --- services/pull/merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/pull/merge.go b/services/pull/merge.go index 83522dae0fb04..2ae23b344712b 100644 --- a/services/pull/merge.go +++ b/services/pull/merge.go @@ -99,8 +99,8 @@ func GetDefaultMergeMessage(baseGitRepo *git.Repository, pr *issues_model.PullRe } for _, ref := range refs { if ref.RefAction == references.XRefActionCloses { - if err := ref.LoadIssue(ctx); err != nil { - return "", "", err + if err := ref.LoadIssue(); err != nil { + return "", err } closeIssueIndexes = append(closeIssueIndexes, fmt.Sprintf("%s %s%d", closeWord, issueReference, ref.Issue.Index)) }