Fix diff parsing for dirty submodules without an index line - #246
Merged
Conversation
A submodule whose working tree changed but still points at the same commit is reported by git without an "index " line before "--- "/"+++ ". DiffParser only looked for those markers inside the "index " block, so it never consumed them in that case and choked on the next hunk. Fixes #165
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.
Summary
DiffParseronly looked for---/+++/Binary filesmarkers inside theindexblock, but git omits theindexline for a "dirty" submodule (working tree changed, same commit checked out), which made the parser choke on the next hunk and throw an exception (reported asgetDiff()failing on repos with submodules).indexconditional so it runs regardless of whether anindexline was present.testDirtySubmoduleWithoutRaw) reproducing the dirty-submodule diff format from the issue.Test plan
vendor/bin/phpunit— 225 tests, 567 assertions, all greencastor cs --dry-run— no style issuescastor phpstan— no errorsFixes #165