Update typed/remove.go

Co-authored-by: Joe Betz <[email protected]>

Author: mrIncompetent

typed/remove.go

@@ -80,12 +80,13 @@ func (w *removingWalker) doList(t *schema.List) (errs ValidationErrors) {
 		path, _ := fieldpath.MakePath(pe)
 		// save items on the path when we shouldExtract
 		// but ignore them when we are removing (i.e. !w.shouldExtract)
+		itemsInToRemoveSubpaths := !w.toRemove.WithPrefix(pe).Empty()
 		if w.shouldExtract {
-			if w.toRemove.Has(path) || !w.toRemove.WithPrefix(pe).Empty() {
-				if !w.toRemove.WithPrefix(pe).Empty() {
-					// Continue if there are subset paths
-					item = removeItemsWithSchema(item, w.toRemove.WithPrefix(pe), w.schema, t.ElementType, w.shouldExtract)
-				}
+			if itemInToRemoveSubpaths {
+				// Continue if there are subset paths
+				item = removeItemsWithSchema(item, w.toRemove.WithPrefix(pe), w.schema, t.ElementType, w.shouldExtract)
+			}
+			if w.toRemove.Has(path) || itemInToRemoveSubpaths {
 				newItems = append(newItems, item.Unstructured())
 			}
 		} else {