Support git's mnemonic diff prefixes in DiffParser - #245
Merged
Conversation
diff.mnemonicPrefix replaces the default "a/"/"b/" prefixes with
context-specific ones ("c/", "i/", "o/", "w/"), which DiffParser's
regexp didn't account for, causing a RuntimeException for tools like
GrumPHP that enable it.
Fixes #114
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
DiffParserhardcoded thea//b/prefixes in thediff --githeader regexp, but git'sdiff.mnemonicPrefixoption (enabled by tools like GrumPHP) replaces them with context-specific single-letter prefixes (c/commit,i/index,o/object,w/work tree), causingNo match for regexp /diff --git (a\/.*) (b\/.*)\n/.Fixes #114
Test plan
DiffTest::testMnemonicPrefixreproducing thec//i/case from the issuevendor/bin/phpunit)php-cs-fixerandphpstanclean