From 632fb5badcbe1636e7cf25ad6e4f176fabf47677 Mon Sep 17 00:00:00 2001
From: Shashvat Kedia <shashvat51@gmail.com>
Date: Wed, 8 Jan 2020 17:23:07 +0530
Subject: [PATCH] Fix #9552: Merge commits generated by pull request capture
pull request details (#9635)
---
models/pull.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/models/pull.go b/models/pull.go
index f86892cbfc..876036c9e1 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -175,7 +175,11 @@ func (pr *PullRequest) GetDefaultMergeMessage() string {
return ""
}
}
- return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.MustHeadUserName(), pr.HeadRepo.Name, pr.BaseBranch)
+ if err := pr.LoadIssue(); err != nil {
+ log.Error("Cannot load issue %d for PR id %d: Error: %v", pr.IssueID, pr.ID, err)
+ return ""
+ }
+ return fmt.Sprintf("Merge pull request '%s' (#%d) from %s/%s into %s", pr.Issue.Title, pr.Issue.Index, pr.MustHeadUserName(), pr.HeadBranch, pr.BaseBranch)
}
// GetCommitMessages returns the commit messages between head and merge base (if there is one)