Skip to content

Complete authenticated pull and the week 6 integration checkpoint - #49

Merged
aman-a-shah merged 7 commits into
mainfrom
feat/pull-network-hardening
Oct 25, 2026
Merged

aman-a-shah merged 7 commits into
mainfrom
feat/pull-network-hardening

Conversation

@Shuhan6017

@Shuhan6017 Shuhan6017 commented Oct 13, 2026 •

Copy link
Copy Markdown
Collaborator

Complete pull by fetching the advertised commit's entire object graph and passing the validated tip to CommitManager.integrate_fetched_tip. Checked-out branches restore or merge their working trees, inactive branches advance without checkout, and conflicts retain their pending state for explicit resolution.

Add authenticated ls-remote, fetch, and multi-branch push/pull with shared-object deduplication. Preserve stale-push rejection, validate branch names and expected object types, bound protocol lines, reject malformed lengths, redact reflected tokens, and keep the server available after bad sessions.

Replace the temporary merge implementation in network tests with the real commit manager. The mandatory Week 6 checkpoint uses fresh CLI processes for branch exchange, real two-parent merges, stale-push rejection, pull conflicts, resolution, and synchronization back to the other repository. Retain the storage PR's packed-only and missing-descendant regressions. README now documents the supported pull workflow.

Closes #41.

Validation: scripts/quality-check.sh (390 tests, including storage, working-tree safety, fetched-tip integration, protocol failure/retry, and subprocess checkpoints).

Co-authored-by: Shuhan6017 <135551146+Shuhan6017@users.noreply.github.com>
Base automatically changed from feat/push-conflict-detection to main October 13, 2026 13:43
@aman-a-shah aman-a-shah changed the title week 6 Complete authenticated pull and the week 6 integration checkpoint Oct 25, 2026
@aman-a-shah
aman-a-shah merged commit 234a3a9 into main Oct 25, 2026
1 check passed
@aman-a-shah
aman-a-shah deleted the feat/pull-network-hardening branch October 25, 2026 23:51
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.

Week 6 - M4: Pull + authenticated multi-ref transfers

3 participants