back round 0 view raw

appview: pulls: fix merge check on stacked PRs #228

merged
opened by oppi.li targeting master from push-tvtwutsrtoxt

this was incorrectly adding the current pull into the formatpatch twice.

Signed-off-by: oppiliappan me@oppi.li

options
unified split
Changed files
+1 -3
appview
pulls
pulls.go
+1 -3
appview/pulls/pulls.go 
···

       
203

       
 

       
	patch := pull.LatestPatch()


     

       
204

       
 

       
	if pull.IsStacked() {


     

       
205

       
 

       
		// combine patches of substack


     

       
206

       
-

       
		subStack := stack.Below(pull)


     

       
207

       
 

       
		// collect the portion of the stack that is mergeable


     

       
208

       
 

       
		mergeable := subStack.Mergeable()


     

       
209

       
 

       
		// combine each patch


     
···

       
293

       
 

       
		latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev


     

       
294

       
 

       
	}


     

       
295

       
 

       



     

       
296

       
-

       
	log.Println(latestSourceRev, result.Branch.Hash)


     

       
297

       
-

       



     

       
298

       
 

       
	if latestSourceRev != result.Branch.Hash {


     

       
299

       
 

       
		return pages.ShouldResubmit


     

       
300

       
 

       
	}


     
···

       
203

       
 

       
	patch := pull.LatestPatch()


     

       
204

       
 

       
	if pull.IsStacked() {


     

       
205

       
 

       
		// combine patches of substack


     

       
206

       
+

       
		subStack := stack.StrictlyBelow(pull)


     

       
207

       
 

       
		// collect the portion of the stack that is mergeable


     

       
208

       
 

       
		mergeable := subStack.Mergeable()


     

       
209

       
 

       
		// combine each patch


     
···

       
293

       
 

       
		latestSourceRev = top.Submissions[top.LastRoundNumber()].SourceRev


     

       
294

       
 

       
	}


     

       
295

       
 

       



     

       

       

       
     

       

       

       
     

       
296

       
 

       
	if latestSourceRev != result.Branch.Hash {


     

       
297

       
 

       
		return pages.ShouldResubmit


     

       
298

       
 

       
	}