lewis.moe
forked from
tangled.org/core
Monorepo for Tangled
appview: pulls: fix merge check on stacked PRs
this was incorrectly adding the current pull into the formatpatch twice.
Signed-off-by: oppiliappan <me@oppi.li>
oppi.li
+1
-3
appview/pulls/pulls.go
+1
-3
appview/pulls/pulls.go
···
203
203
patch := pull.LatestPatch()
204
204
if pull.IsStacked() {
205
205
// combine patches of substack
206
-
subStack := stack.Below(pull)
206
+
subStack := stack.StrictlyBelow(pull)
207
207
// collect the portion of the stack that is mergeable
208
208
mergeable := subStack.Mergeable()
209
209
// combine each patch
···
292
292
top := stack[0]
293
293
latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev
294
294
}
295
-
296
-
log.Println(latestSourceRev, result.Branch.Hash)
297
295
298
296
if latestSourceRev != result.Branch.Hash {
299
297
return pages.ShouldResubmit