diff options
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/repo/compare.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/routers/repo/compare.go b/routers/repo/compare.go index a8f4f8add8..38c3005cf7 100644 --- 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 } |