Fix config parsing for multiline with multiple quoted comment chars - #6043
Merged
ethomson merged 2 commits intoSep 14, 2021
Merged
ethomson merged 2 commits into
ethomson merged 2 commits into
Conversation
Copy link
Copy Markdown
Contributor
Sorry, something went wrong.
This tests parsing a multiline string containing multiple quoted comment chars. See libgit2#6019
The strip_comments function uses the count of quotes to know if a
comment char (';' or '#') is the start of a comment or part of the
multiline as a string.
Unfortunately converting the count of quotes from previous lines to a
boolean meant that it would only work as expected in some cases
(0 quotes or an odd number of quotes).
Copy link
Copy Markdown
Member
I do, too! Thanks, @basile-henry! |
Sorry, something went wrong.
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.
Fixes #6019
The issue this PR fixes happened when parsing a git config with the following:
NB: comment characters (';' or '#') need to be quoted in order for them to be part of a string, otherwise they indicate the start of a comment. Comments are surprisingly permitted in the middle of a multiline variable.
I have added a small test that showcases the issue and then fixed it in a subsequent commit.
The fix is simply to keep the count of quotes in the multiline as an int instead of making it a bool before passing it to the strip_comments function. This seems to work just fine and all the tests now pass. I do wonder what was intended by the boolean "casting" 🤔