Commit 28bd20a
committed
Fix GitCLI environment filtering and cleanup duplication
- Consolidated duplicated GitCLI class implementations into a single cohesive class.
- Fixed environment filtering in envs() to correctly re-initialize config attributes (ref_types, disable_saltenv_mapping) from the instance, ensuring global and per-remote overrides are respected.
- Added missing threading import in salt/utils/gitfs.py.
- Cleaned up unnecessary pass statement in setup_callbacks to satisfy pylint.1 parent f22f5df commit 28bd20a
11 files changed
Lines changed: 234 additions & 181 deletions
File tree
- agents/docs
- salt
- config
- fileserver
- pillar
- utils
- tests
- pytests/unit
- fileserver/gitfs
- utils
- support
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
158 | 158 | | |
159 | 159 | | |
160 | 160 | | |
| 161 | + | |
| 162 | + | |
161 | 163 | | |
162 | 164 | | |
163 | 165 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1182 | 1182 | | |
1183 | 1183 | | |
1184 | 1184 | | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
1185 | 1188 | | |
1186 | 1189 | | |
1187 | 1190 | | |
| |||
1202 | 1205 | | |
1203 | 1206 | | |
1204 | 1207 | | |
| 1208 | + | |
1205 | 1209 | | |
1206 | 1210 | | |
1207 | 1211 | | |
| |||
1308 | 1312 | | |
1309 | 1313 | | |
1310 | 1314 | | |
| 1315 | + | |
1311 | 1316 | | |
1312 | 1317 | | |
1313 | 1318 | | |
| |||
1451 | 1456 | | |
1452 | 1457 | | |
1453 | 1458 | | |
| 1459 | + | |
| 1460 | + | |
| 1461 | + | |
1454 | 1462 | | |
1455 | 1463 | | |
1456 | 1464 | | |
| |||
1471 | 1479 | | |
1472 | 1480 | | |
1473 | 1481 | | |
| 1482 | + | |
1474 | 1483 | | |
1475 | 1484 | | |
1476 | 1485 | | |
| |||
1649 | 1658 | | |
1650 | 1659 | | |
1651 | 1660 | | |
| 1661 | + | |
1652 | 1662 | | |
1653 | 1663 | | |
1654 | 1664 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
65 | 65 | | |
66 | 66 | | |
67 | 67 | | |
| 68 | + | |
68 | 69 | | |
69 | 70 | | |
70 | 71 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
406 | 406 | | |
407 | 407 | | |
408 | 408 | | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
409 | 412 | | |
410 | 413 | | |
411 | 414 | | |
| |||
0 commit comments