sx-git Phase 7: porcelain — init/add/commit/branch/checkout/tag/reset/merge/log/diff (TDD)

End-to-end topology story: fork, diverge, real merge commit (parents in
order), fast-forward + up-to-date, annotated + lightweight tags, soft/mixed
reset, detached HEAD commits, staged/unstaged unified diffs. Conflicted
merges park MERGE_HEAD + stage the marker tree; git/merge-commit! concludes
with two parents after resolution. Extensible commit meta flows through
porcelain (agentic-sx shape verified). 40/40 — ROADMAP COMPLETE 227/227.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
2026-07-03 12:25:26 +00:00
parent 989dc278c1
commit 7d3f267503
5 changed files with 510 additions and 5 deletions

View File

@@ -10,4 +10,5 @@ _Generated by `lib/git/conformance.sh`_
| worktree | 26 | 0 | 26 |
| diff | 27 | 0 | 27 |
| merge | 28 | 0 | 28 |
| **Total** | **187** | **0** | **187** |
| porcelain | 40 | 0 | 40 |
| **Total** | **227** | **0** | **227** |