fix: improve git subtree pull error messages and limit split info search to HEAD#16
Merged
Conversation
csjones
commented
Mar 4, 2026
csjones
commented
Contributor
- Changed findSubtreeSplitInfo() to search HEAD instead of --all branches
- Enhanced subtreePull() error messages to include both stdout and stderr
- Added filtering of empty output lines in error details
…rch to HEAD - Changed findSubtreeSplitInfo() to search HEAD instead of --all branches - Enhanced subtreePull() error messages to include both stdout and stderr - Added filtering of empty output lines in error details
csjones
added a commit
that referenced
this pull request
Mar 23, 2026
- Added `base` field to ExtractionMapping ("root" or "match") for path structure control
- Added `--base` CLI flag with validation for "root" or "match" values
- Implemented destinationRelativePath() to strip literal prefix when base:match is active
- Added buildExpandedPrefixMap() to trace expanded patterns to original literal prefixes
- Updated deduplication logic to use destination-relative paths for base:match mode
csjones
added a commit
that referenced
this pull request
Mar 23, 2026
feat: implement base mode for extraction path control (#16) - Added `base` field to ExtractionMapping ("root" or "match") for path structure control - Added `--base` CLI flag with validation for "root" or "match" values - Implemented destinationRelativePath() to strip literal prefix when base:match is active - Added buildExpandedPrefixMap() to trace expanded patterns to original literal prefixes - Updated deduplication logic to use destination-relative paths for base:match mode Co-authored-by: csjones <637026+csjones@users.noreply.github.com>
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
1 participant
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.