Skip to content
Snippets Groups Projects
Commit 19880644 authored by Hans Moog's avatar Hans Moog
Browse files

Fix: finalized wasn't propagated when a branch was rejected

parent 4fdb0ce6
No related branches found
No related tags found
No related merge requests found
......@@ -391,6 +391,11 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc
branchManager.Events.BranchFinalized.Trigger(cachedBranch)
// propagate finalized to aggregated child branches
if err = branchManager.propagateFinalizedToAggregatedChildBranches(cachedBranch.Retain()); err != nil {
return
}
if !branch.Preferred() {
branchManager.propagateRejectedToChildBranches(cachedBranch.Retain())
......@@ -416,11 +421,6 @@ func (branchManager *BranchManager) setBranchFinalized(cachedBranch *CachedBranc
})
}
// propagate finalized to aggregated child branches
if err = branchManager.propagateFinalizedToAggregatedChildBranches(cachedBranch.Retain()); err != nil {
return
}
// schedule confirmed checks of children
err = branchManager.propagateConfirmedToChildBranches(cachedBranch.Retain())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment