Fix #9552: Merge commits generated by pull request capture pull request details (#9635)

shashvat-kedia · zeripath · commit 632fb5badcbe · 2020-01-08T11:53:07.000Z
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,11 @@ func (pr *PullRequest) GetDefaultMergeMessage() string {`
`175`	`175`	`return ""`
`176`	`176`	`}`
`177`	`177`	`}`
`178`		`- return fmt.Sprintf("Merge branch '%s' of %s/%s into %s", pr.HeadBranch, pr.MustHeadUserName(), pr.HeadRepo.Name, pr.BaseBranch)`
	`178`	`+ if err := pr.LoadIssue(); err != nil {`
	`179`	`+ log.Error("Cannot load issue %d for PR id %d: Error: %v", pr.IssueID, pr.ID, err)`
	`180`	`+ return ""`
	`181`	`+ }`
	`182`	`+ 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)`
`179`	`183`	`}`
`180`	`184`
`181`	`185`	`// GetCommitMessages returns the commit messages between head and merge base (if there is one)`