Commit 54eb4f1
committed
test: run git non-interactively in test helpers
After resolving conflicts, `git rebase --continue` opens an editor by
default on the merge backend (git >= 2.26) to confirm the commit message.
CI runners have no editor (no tty, EDITOR/GIT_EDITOR unset), so it fails
with "Terminal is dumb, but EDITOR unset", breaking the two tests that
assert `git rebase --continue` succeeds:
rebase_continue_corrupted_state_file and rebase_continue_skip_progress_reporting.
Set GIT_EDITOR/GIT_SEQUENCE_EDITOR=true in the command helpers so git
reuses the existing commit message non-interactively, mirroring git's own
test harness (GIT_EDITOR=:). These tests pass on macOS (local editor
configured) but failed on the ubuntu CI runners.1 parent 0eae6e0 commit 54eb4f1
1 file changed
Lines changed: 15 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
226 | 226 | | |
227 | 227 | | |
228 | 228 | | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
229 | 234 | | |
230 | 235 | | |
231 | 236 | | |
| |||
252 | 257 | | |
253 | 258 | | |
254 | 259 | | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
255 | 264 | | |
256 | 265 | | |
257 | 266 | | |
| |||
313 | 322 | | |
314 | 323 | | |
315 | 324 | | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
316 | 331 | | |
317 | 332 | | |
318 | 333 | | |
| |||
0 commit comments