Browse Source

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

Signed-off-by: a1012112796 <1012112796@qq.com>
mj-v1.14.3
a1012112796 1 year ago
committed by GitHub
parent
commit
61308825a6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      routers/repo/compare.go

10
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
}

Loading…
Cancel
Save