Commit 2d16f06
committed
fix(tag-repos): take branch from TAG_REPOS entry, not expected_branch
cmd_tag_repos unpacked dev_b/main_b from the TAG_REPOS entry but then
re-derived the branch via expected_branch(), which consults the real
stack_repos() table. After the pi de-fork, 'pi' is no longer in that
table, so test_devstack_tag_repos (which tags a fake 'pi' repo) resolved
an empty branch, 'rev-parse origin/' exited 128 while still printing the
argument to stdout, the empty-sha guard was bypassed, and the command
attempted a garbage 'origin/:refs/tags/...' push — CI test job failed.
- select the branch from the TAG_REPOS tuple (mirrors the CI tag-repos
job and keeps the command testable with a mocked repo set)
- harden the guard: check the rev-parse exit code, not just empty output1 parent 5d1107f commit 2d16f06
1 file changed
Lines changed: 7 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
71 | 70 | | |
72 | 71 | | |
73 | 72 | | |
| |||
207 | 206 | | |
208 | 207 | | |
209 | 208 | | |
210 | | - | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
211 | 213 | | |
212 | 214 | | |
213 | 215 | | |
| |||
218 | 220 | | |
219 | 221 | | |
220 | 222 | | |
221 | | - | |
222 | | - | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
223 | 226 | | |
224 | 227 | | |
225 | 228 | | |
| |||
0 commit comments