Commit c93d809
committed
Fail composition when a dangling override is rescued by an append
A Defaults List override with no earlier Group Default to override correctly
fails on its own, but a matching command line append made the composition
succeed and silently replaced the appended value with the dangling override's.
Stop registering a defaults list's own override when an externally appended
group default of the same key is resolved. The appended entry now composes
without consulting the dangling override, which is then reported unused, so
the composition fails exactly as it does without the append. Command line
overrides of appended groups are registered before traversal and still apply.
Add regression coverage for the dangling override with and without the append.
Fixes #33181 parent ee7d3e7 commit c93d809
3 files changed
Lines changed: 18 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
574 | 574 | | |
575 | 575 | | |
576 | 576 | | |
577 | | - | |
578 | | - | |
579 | | - | |
580 | | - | |
581 | | - | |
582 | | - | |
583 | | - | |
584 | | - | |
585 | | - | |
586 | | - | |
587 | 577 | | |
588 | 578 | | |
589 | 579 | | |
| |||
613 | 603 | | |
614 | 604 | | |
615 | 605 | | |
616 | | - | |
617 | | - | |
618 | | - | |
619 | | - | |
620 | | - | |
621 | 606 | | |
622 | 607 | | |
623 | 608 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | | - | |
219 | | - | |
220 | | - | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
221 | 225 | | |
222 | | - | |
| 226 | + | |
223 | 227 | | |
224 | 228 | | |
225 | 229 | | |
| |||
2625 | 2629 | | |
2626 | 2630 | | |
2627 | 2631 | | |
| 2632 | + | |
| 2633 | + | |
| 2634 | + | |
| 2635 | + | |
| 2636 | + | |
| 2637 | + | |
| 2638 | + | |
| 2639 | + | |
| 2640 | + | |
2628 | 2641 | | |
2629 | 2642 | | |
2630 | 2643 | | |
| |||
0 commit comments