Commit 20702f9
committed
Sync main back to beta: bring Copilot fixes from #426 onto beta
Closes the final 55-line content drift between beta and main. PR #426
was squash-merged into main, so the two Copilot review fixes I pushed
during its review cycle landed on main as part of the squash commit
but never made it back to beta:
- Path-traversal guard in tests/integration/_self_update_fixture.py
(mirrors update_reload_runner.gd's runtime check)
- Negative-path tests for v2.4.0+ addon-shape preflight in
tests/unit/test_self_update_smoke_harness.py (+4 tests)
After this merges, beta and main are content-identical and the
merge graph reflects an ongoing-convergence relationship.
https://claude.ai/code/session_01VgXf3Lqv2ypt36g6EqpRYg
# Conflicts:
# tests/integration/_self_update_fixture.py2 files changed
Lines changed: 55 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
279 | 279 | | |
280 | 280 | | |
281 | 281 | | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
282 | 287 | | |
283 | 288 | | |
284 | 289 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
| 13 | + | |
12 | 14 | | |
13 | 15 | | |
14 | 16 | | |
| |||
208 | 210 | | |
209 | 211 | | |
210 | 212 | | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
211 | 261 | | |
212 | 262 | | |
213 | 263 | | |
| |||
0 commit comments