Show pull request selection even when unrelated branches (#11239) (#11283)

Fix #10525

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>

diff --git a/routers/repo/compare.go b/routers/repo/compare.go
index 92a666891eaa1905512412cc68b41b2fa7ac0acb..cabb7365f421bc08821792241b3f6c8aa343df12 100644 (file)
--- a/routers/repo/compare.go
+++ b/routers/repo/compare.go
@@ -320,9 +320,6 @@ func PrepareCompareDiff(
        compareInfo.Commits = models.ParseCommitsWithStatus(compareInfo.Commits, headRepo)
        ctx.Data["Commits"] = compareInfo.Commits
        ctx.Data["CommitCount"] = compareInfo.Commits.Len()
-       if ctx.Data["CommitCount"] == 0 {
-               ctx.Data["PageIsComparePull"] = false
-       }
 
        if compareInfo.Commits.Len() == 1 {
                c := compareInfo.Commits.Front().Value.(models.SignCommitWithStatuses)

diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index 50a51c44acc2046dc7369a2547e49256ed2ec6c4..db097ee356a202462423597b37305d8e483c3ac5 100644 (file)
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -59,7 +59,7 @@
 
        {{if .IsNothingToCompare}}
        <div class="ui segment">{{.i18n.Tr "repo.pulls.nothing_to_compare"}}</div>
-       {{else if .PageIsComparePull}}
+       {{else if and .PageIsComparePull (gt .CommitCount 0)}}
                {{if .HasPullRequest}}
                <div class="ui segment">
                        {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}}