Commit 4567741
fix(test): drop the duplicate classify() guard and test the cnighswonger#356 merge left behind
conflict-shape.sh's additive resolution on the cnighswonger#356 merge kept both sides of
two hunks where cnighswonger#356 (cut from upstream, before cnighswonger#345 or cnighswonger#355 existed)
independently re-added content cnighswonger#345 had already added on this branch: a
second `if (typeof body !== "string") return null;` guard (with its own,
now-superseded comment) stacked dead beneath the one already in classify(),
and a second, byte-identical copy of the
"classify survives a probe that answers with a status code" test right after
it. Both were textually different insertions at the same conflict hunk (so
"additive" concatenated them) but semantically the same content twice.
Neither duplicate changed behaviour -- the second guard clause is
unreachable, and node:test does not refuse a duplicate case name -- so the
suite passed either way; kept once, as the recorded resolution for this file
already documents keeping ours' guard.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QFPGPPSYmx8NNGqbEsSpNc
Co-Authored-By: Claude <noreply@anthropic.com>1 parent 12d17d4 commit 4567741
1 file changed
Lines changed: 0 additions & 20 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | 56 | | |
64 | 57 | | |
65 | 58 | | |
| |||
236 | 229 | | |
237 | 230 | | |
238 | 231 | | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | | - | |
245 | | - | |
246 | | - | |
247 | | - | |
248 | | - | |
249 | | - | |
250 | | - | |
251 | | - | |
252 | 232 | | |
253 | 233 | | |
254 | 234 | | |
| |||
0 commit comments