Repository navigation
Preserved branch: queue/4414-2733-s3-list-validation — decision needed (merge / cherry-pick / drop) #3543
Description
Preserved branch from the laptop worktree cleanup of 2026-11-01.
- Branch:
queue/4414-2733-s3-list-validation - Verified HEAD on origin:
95bf2684e4ea5345e2f7d805db814bf93c684580 - Provenance: this branch holds work that existed only in a local worktree on the laptop (unique commits and/or a rescue commit of uncommitted work: "rescue: preserve uncommitted work from worktree cleanup 2026-11-01"). It was pushed so the worktree could be removed without losing the work; the local tree and local branch are gone.
- Decision needed: merge it, cherry-pick from it, or drop the branch. Nothing else references it; this issue is the record of what it holds.
Activity
developing-today commentedon Nov 1, 2026
CODE-1370
dezren39 commentedon Nov 3, 2026
Queue task 7321 (triage, openchamber scheduled lane). Verdict: the preserved branch's work already landed — nothing to merge, cherry-pick or drop. Closing.
The branch is gone; the commit is not.
queue/4414-2733-s3-list-validationno longer exists on origin (git ls-remote --headsfinds no match;GET /repos/.../branches/...→ 404). Its HEAD95bf2684e4ea5345e2f7d805db814bf93c684580still exists in the object store: fix(cold-store-reaper): fail closed on malformed S3 list pages (#2733), 2026-10-31T16:10:14Z.It was merged hours later the same day. PR #3133 (
head: queue/4414-2733-s3-list-validation→base: main) is MERGED at 2026-10-31T18:38:28Z, merge commit5cc6badd086ac2f60d4faff43622e2479032aa2e, which is an ancestor oforigin/main(head at check:8e76c6fa5). Squash, which is why a naivemerge-base --is-ancestor 95bf268 mainsays "no".Contents are identical, not merely similar. The branch held exactly one commit (
git rev-list --count b878339..95bf268= 1), andgit diff 95bf268^ 95bf268is byte-identical (diff -qclean) togit show 5cc6bad --format=""— 2 files, +103/−2, same paths (pkgs/cold-store-reaper/cold_store.py,pkgs/cold-store-reaper/tests/test_cold_store.py).Still present at current main, no revert.
cold_store.pyretains the fail-closed guard ("(refusing to read a non-listing body as an empty bucket)");tests/test_cold_store.pyretainsclass TestS3ListPageValidation. The only later commit touchingcold_store.pyis merge2f62ce6c9(#4626), which did not remove it.Branch not deleted by this triage — it was already absent from origin before the task, and the no-delete rule is respected.
Closing as completed: the decision this issue asked for is "merged", with the merge recorded above.
dezren39 commentedon Nov 3, 2026
Done — task 7321 completed
already_done, issue closed as completed. Lifecycle labels removed; nothing in flight.No branch or PR created (correct outcome here): the preserved branch's single commit is byte-identical to merged commit
5cc6badd0(PR #3133, merged 2026-10-31T18:38:28Z, on main), and the branch was already absent from origin. Evidence is in the closing comment above.