fix(gcam): rebase --files paths for deleted files - #127
Merged
Conversation
…list normalize_files rebased explicit --files entries purely by filesystem existence — which never fires for a deleted file (it exists at neither the repo root nor the invoking cwd). A cwd-relative --files entry for a deletion was passed through untouched and died as a raw pathspec error, failing the whole batch `git add` and making it impossible to commit a change set containing deletions. Fall back to a syntactic rebase validated against `git ls-files -d`: only paths git itself reports as deleted-tracked are rebased; anything else is still left for git to report.
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
2 participants
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.
normalize_files rebased explicit --files entries purely by filesystem
existence — which never fires for a deleted file (it exists at neither
the repo root nor the invoking cwd). A cwd-relative --files entry for a
deletion was passed through untouched and died as a raw pathspec error,
failing the whole batch
git addand making it impossible to commit achange set containing deletions.
Fall back to a syntactic rebase validated against
git ls-files -d:only paths git itself reports as deleted-tracked are rebased; anything
else is still left for git to report.