should run RetrieveRepoMetas() for empty pr (#15187) (#15190)

Signed-off-by: a1012112796 <1012112796@qq.com>
go-gitea · Mar 29, 2021 · 6130882 · 6130882
1 parent 0cccad0
commit 6130882
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/routers/repo/compare.go b/routers/repo/compare.go
@@ -431,11 +431,15 @@ func PrepareCompareDiff(
 		ctx.Data["IsNothingToCompare"] = true
 		if unit, err := repo.GetUnit(models.UnitTypePullRequests); err == nil {
 			config := unit.PullRequestsConfig()
+
 			if !config.AutodetectManualMerge {
-				ctx.Data["AllowEmptyPr"] = !(baseBranch == headBranch && ctx.Repo.Repository.Name == headRepo.Name)
-			} else {
-				ctx.Data["AllowEmptyPr"] = false
+				allowEmptyPr := !(baseBranch == headBranch && ctx.Repo.Repository.Name == headRepo.Name)
+				ctx.Data["AllowEmptyPr"] = allowEmptyPr
+
+				return !allowEmptyPr
 			}
+
+			ctx.Data["AllowEmptyPr"] = false
 		}
 		return true
 	}