feat: git edit - jj-style mid-stack editing #8
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Uses libgit2's git_revwalk to collect commits between a target and HEAD (exclusive of target, inclusive of HEAD) in oldest-first order. This is needed to identify which commits must be rebased after editing a commit mid-stack. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
Test coverage includes: - Happy path: edit, amend, --back rebases descendants - --abort: restores original state cleanly - --status: reports accurately with active/inactive states - Error on dirty tree: both for starting edit and --back - Error on invalid target: non-existent commits, non-ancestors - Error when edit already active - Error from detached HEAD - Conflict handling tests (skipped due to segfault bug in implementation) The conflict handling tests document expected behavior but are skipped because the current implementation has a bug in completeEdit() where git_index_read_tree() is called with null, causing a segfault.
Resolve conflicts: - AGENTS.md: Keep both git edit and agent subcommands sections - src/passthrough.zig: Include all imports (edit, git, detect)
Bug fix: - Replace git_index_read_tree(repo_index, null) with git_index_clear(repo_index) - The null pointer caused a segfault when cherry-pick had conflicts Test changes: - Enable all 5 previously skipped conflict handling tests - All 28 tests now pass with 0 skipped
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
git editcommand for jj-style mid-stack editingCommands
Test plan
Generated with Claude Code