Repository navigation
fix(commit): split staging failures and AI grouping spinner layout - #85
Merged
Merged
Conversation
Leave a blank line after "Grouping changes by feature with AI..." so the spinner and its timer don't sit right under the header, matching the fetch/pull progress layout. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_013XG3b9rDvS5K2grqinUniN
Each split group was restaged by re-adding the worktree copy of its files. That failed with "Cannot stage files for scope" when a staged file was no longer in the worktree (or git hit a lock), and silently committed unstaged edits for partially staged files. Restage each group from the pre-split index tree instead, show git's error when staging fails, and restore the original index exactly. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_013XG3b9rDvS5K2grqinUniN
maxbolgarin
changed the title
|
🎉 This PR is included in version 5.4.1 🎉 The release is available on: Your semantic-release bot 📦🚀 |
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
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.
Two fixes in the commit split flow (
gitb c ffand friends).Split staging (
✗ Cannot stage files for scope '…')Each split group used to be restaged by running
git addon the worktree copy of its files. That:pathspec did not match), or when git couldn't takeindex.lock. The flow then fell back to one big commit;Each group is now restaged from the pre-split index tree (
git restore --staged --source=<orig tree>), which is exact: partial hunks, deletions, and files gone from the worktree all come through as staged. When staging does fail, git's error is shown and the original index is restored from the tree. A regression test covers this; it fails without the fix.Spinner layout
A blank line now separates "Grouping changes by feature with AI..." from its spinner, like fetch/pull. The duplicate blank line before the split preview is skipped.
test_commit_*.batspasses except for twotest_commit_push_no_dupcases, which fail the same way on the base branch in this sandbox.🤖 Generated with Claude Code
https://claude.ai/code/session_013XG3b9rDvS5K2grqinUniN