Merge pull request libgit2#6043 from basile-henry/config-multiline-comment-chars

ethomson · web-flow · commit 1f6263b82bf0 · 2021-09-14T07:43:35.000-04:00
Fix config parsing for multiline with multiple quoted comment chars
diff --git a/src/config_parse.c b/src/config_parse.c
@@ -349,7 +349,7 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 		}
 
 		/* If it was just a comment, pretend it didn't exist */
-		quote_count = strip_comments(line, !!in_quotes);
+		quote_count = strip_comments(line, in_quotes);
 		if (line[0] == '\0')
 			goto next;
 
diff --git a/tests/config/read.c b/tests/config/read.c
@@ -213,6 +213,13 @@ void test_config_read__symbol_headers(void)
 	git_config_free(cfg);
 }
 
+void test_config_read__multiline_multiple_quoted_comment_chars(void)
+{
+	git_config *cfg;
+	cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config21")));
+	git_config_free(cfg);
+}
+
 void test_config_read__header_in_last_line(void)
 {
 	git_config *cfg;
diff --git a/tests/resources/config/config21 b/tests/resources/config/config21
@@ -0,0 +1,5 @@
+[alias]
+	m = '\
+	";" \
+	";" \
+	'

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ static int parse_multiline_variable(git_config_parser reader, git_buf value, i`
`349`	`349`	`}`
`350`	`350`
`351`	`351`	`/* If it was just a comment, pretend it didn't exist */`
`352`		`- quote_count = strip_comments(line, !!in_quotes);`
	`352`	`+ quote_count = strip_comments(line, in_quotes);`
`353`	`353`	`if (line[0] == '\0')`
`354`	`354`	`goto next;`
`355`	`355`
Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,13 @@ void test_config_read__symbol_headers(void)`
`213`	`213`	`git_config_free(cfg);`
`214`	`214`	`}`
`215`	`215`
	`216`	`+void test_config_read__multiline_multiple_quoted_comment_chars(void)`
	`217`	`+{`
	`218`	`+ git_config *cfg;`
	`219`	`+ cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config21")));`
	`220`	`+ git_config_free(cfg);`
	`221`	`+}`
	`222`	`+`
`216`	`223`	`void test_config_read__header_in_last_line(void)`
`217`	`224`	`{`
`218`	`225`	`git_config *cfg;`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +[alias]
 +	m = '\
 +	";" \
 +	";" \
 +	'