Skip to content

http: import upstream packfile-URI concurrency fixes - #28

Merged
ttaylorr-oai merged 0 commit into
codexfrom
tb/codex/packfile-uri-concurrency
Aug 10, 2026
Merged

http: import upstream packfile-URI concurrency fixes#28
ttaylorr-oai merged 0 commit into
codexfrom
tb/codex/packfile-uri-concurrency

Conversation

@ttaylorr-oai

@ttaylorr-oai ttaylorr-oai commented Aug 8, 2026

Copy link
Copy Markdown
Collaborator

This carries Ted Nyman's six-commit tn/packfile-uri-concurrency topic, as merged into Git's jch at 8004c4e. The topic is rebased onto the current openai/git master so Codex v3 can infer master as its lane boundary. Downstream head is 4cc8b3223b; the upstream source tip is c4244bd. git range-diff reports all six patches unchanged.

The series fixes resumed and concurrent packfile-URI downloads: it accepts a complete partial pack after HTTP 416, avoids concurrent append corruption, keeps indexing safe across unlink/Windows sharing behavior, and preserves a pre-existing .keep file. It also fixes the --index-pack-arg documentation and a double-close in the HTTP pack path.

Upstream commits:

  1. c71ed75 http-fetch: correct --index-pack-arg documentation
  2. f0d866a http: avoid closing index-pack input twice
  3. 85f4f04 http: accept HTTP 416 for complete partial packs
  4. 5e855d9 http: avoid concurrent appends to partial packs
  5. e92a518 http: permit unlinking partial packs on Windows
  6. c4244bd fetch-pack: accept "pack" output for packfile URIs

Validation:

  • make -j8 DEVELOPER=1 git git-http-fetch git-http-push
  • GIT_TEST_HTTPD=true make -C t t5550-http-fetch-dumb.sh (63/63)
  • GIT_TEST_HTTPD=true make -C t t5702-protocol-v2.sh (86/86)
  • git range-diff 55526a1..c4244bd origin/master..HEAD (six patch-equivalent commits)
  • git diff --check origin/master..HEAD
  • git merge-tree --write-tree origin/codex HEAD

This PR is the reviewed topic artifact. The Codex v3 plan/rebuild flow, rather than a direct merge of this PR, enrolls it into codex.

@ttaylorr-oai
ttaylorr-oai marked this pull request as ready for review August 8, 2026 17:43
@ttaylorr-oai
ttaylorr-oai force-pushed the tb/codex/packfile-uri-concurrency branch from c4244bd to 4cc8b32 Compare August 8, 2026 17:57
@ttaylorr-oai
ttaylorr-oai merged commit 00ee4fe into codex Aug 10, 2026
115 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants