From adaf5d94f29372f6855cc56546e5f17fb2fe5dca Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Sat, 7 Jun 2025 16:33:16 +0100 Subject: [PATCH] appview: pulls: fix merge check on stacked PRs Change-Id: tvtwutsrtoxtykzslnlpzykszzylsyty this was incorrectly adding the current pull into the formatpatch twice. Signed-off-by: oppiliappan --- appview/pulls/pulls.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go index ab80aff..6f2100d 100644 --- a/appview/pulls/pulls.go +++ b/appview/pulls/pulls.go @@ -203,7 +203,7 @@ func (s *Pulls) mergeCheck(f *reporesolver.ResolvedRepo, pull *db.Pull, stack db patch := pull.LatestPatch() if pull.IsStacked() { // combine patches of substack - subStack := stack.Below(pull) + subStack := stack.StrictlyBelow(pull) // collect the portion of the stack that is mergeable mergeable := subStack.Mergeable() // combine each patch @@ -293,8 +293,6 @@ func (s *Pulls) resubmitCheck(f *reporesolver.ResolvedRepo, pull *db.Pull, stack latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev } - log.Println(latestSourceRev, result.Branch.Hash) - if latestSourceRev != result.Branch.Hash { return pages.ShouldResubmit } -- 2.43.0