Fix path parsing for git grep filename-only output with hyphens#2185
Open
momomuchu wants to merge 1 commit into
Open
Fix path parsing for git grep filename-only output with hyphens#2185momomuchu wants to merge 1 commit into
momomuchu wants to merge 1 commit into
Conversation
parse_grep_line applied the path:line:code separator regexes even when git grep was run with -l, -L, --name-only, --files-with-matches or --files-without-match. Those modes emit a bare path with no separator, so a hyphen in the path (e.g. dev-account/policy.tf) got misread as the nomatch separator and rewritten, corrupting the path. Detect filename-only output from the git grep command line and pass the line through as a plain path instead of running it through the separator-guessing regexes. Fixes dandavison#1869
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.
Fixes #1869
git grep -l/-L/--name-only/--files-with-matches/--files-without-match emit a bare path per line, no separator, no code. parse_grep_line was still running that bare path through the path:line:code separator regexes, so a hyphen in the path got misread as the nomatch separator and rewritten as a colon.
Detects filename-only output from the git grep command line and passes the line through as a plain path instead.
Same root cause as #1674 (git grep -l), so this should fix that one too.