Repository navigation
Commit 93a5123
committed
Fix pathless config patch shadowing detection
When a manifest has a path-less patch entry (git or registry) and the
config also has a path-less patch entry with the same key, the config
entry should shadow the manifest entry. However, the comparison
'*p != own' evaluates to 'None != None' which is false, causing the
shadowing to not be detected.
Changed the condition to '!(p.is_some() && *p == own)' which properly
detects shadowing for path-less entries while preserving the same-path
exception for entries with matching paths.1 parent 52230be commit 93a5123
1 file changed
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1435 | 1435 | | |
1436 | 1436 | | |
1437 | 1437 | | |
1438 | | - | |
| 1438 | + | |
1439 | 1439 | | |
1440 | 1440 | | |
1441 | 1441 | | |
| |||
0 commit comments