Search the log literally as intended

setup_revisions compiles the pattern itself, and the literal type cgit
set afterwards came too late, so text that was no valid regular
expression, such as an unbalanced bracket, ended in a 500.

2 files changed, 13 insertions, 6 deletions

diff --git a/source/ui-log.c b/source/ui-log.cindex 793f145..98efcf6 100644--- a/source/ui-log.c+++ b/source/ui-log.c@@ -489,6 +489,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern 	if (grep && pattern && *pattern) { 		pattern = xstrdup(pattern); 		if (!strcmp(grep, "grep") || !strcmp(grep, "author") || !strcmp(grep, "committer")) {+			// The search is literal and ignores case. setup_revisions+			// compiles the pattern, so the flags go in with it.+			strvec_push(&rev_argv, "--fixed-strings");+			strvec_push(&rev_argv, "--regexp-ignore-case"); 			strvec_pushf(&rev_argv, "--%s=%s", grep, pattern); 		} else if (!strcmp(grep, "range")) { 			char *arg;@@ -542,18 +546,12 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern 	setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL); 	load_ref_decorations(NULL, DECORATE_FULL_REFS); 	rev.show_decorations = 1;-	rev.grep_filter.ignore_case = 1;-	// The search is literal. A pattern would run as a regular expression-	// over every message in the history, and one with a backreference-	// takes exponential time to match.-	rev.grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;  	rev.diffopt.detect_rename = 1; 	rev.diffopt.rename_limit = ctx.cfg.renamelimit; 	if (ctx.qry.ignorews) 		DIFF_XDL_SET(&rev.diffopt, IGNORE_WHITESPACE); -	compile_grep_patterns(&rev.grep_filter); 	// A failed setup leaves the walk holding freed commits, so it must 	// not be read from. 	if (prepare_revision_walk(&rev)) {
diff --git a/source/ui-log.c b/source/ui-log.c
index 793f145..98efcf6 100644
--- a/source/ui-log.c
+++ b/source/ui-log.c
@@ -489,6 +489,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	if (grep && pattern && *pattern) {
 		pattern = xstrdup(pattern);
 		if (!strcmp(grep, "grep") || !strcmp(grep, "author") || !strcmp(grep, "committer")) {
+			// The search is literal and ignores case. setup_revisions
+			// compiles the pattern, so the flags go in with it.
+			strvec_push(&rev_argv, "--fixed-strings");
+			strvec_push(&rev_argv, "--regexp-ignore-case");
 			strvec_pushf(&rev_argv, "--%s=%s", grep, pattern);
 		} else if (!strcmp(grep, "range")) {
 			char *arg;
@@ -542,18 +546,12 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	setup_revisions(rev_argv.nr, rev_argv.v, &rev, NULL);
 	load_ref_decorations(NULL, DECORATE_FULL_REFS);
 	rev.show_decorations = 1;
-	rev.grep_filter.ignore_case = 1;
-	// The search is literal. A pattern would run as a regular expression
-	// over every message in the history, and one with a backreference
-	// takes exponential time to match.
-	rev.grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
 
 	rev.diffopt.detect_rename = 1;
 	rev.diffopt.rename_limit = ctx.cfg.renamelimit;
 	if (ctx.qry.ignorews)
 		DIFF_XDL_SET(&rev.diffopt, IGNORE_WHITESPACE);
 
-	compile_grep_patterns(&rev.grep_filter);
 	// A failed setup leaves the walk holding freed commits, so it must
 	// not be read from.
 	if (prepare_revision_walk(&rev)) {
diff --git a/tests/t0103-log.sh b/tests/t0103-log.shindex 9671e7f..573baa8 100755--- a/tests/t0103-log.sh+++ b/tests/t0103-log.sh@@ -110,4 +110,13 @@ test_expect_success 'the log draws the commit graph when enabled' ' 	grep "class=.commitgraph." tmp ' +# The search is literal, so text that is no valid regular expression still+# finds the commit holding it.+test_expect_success 'a search for brackets matches them literally' '+	git -C repos/foo commit --allow-empty -m "fix [brackets] in docs" &&+	cgit_url "foo/log&qt=grep&q=%5Bbrackets" >tmp &&+	grep "^Status: 200" tmp &&+	grep "fix \\[brackets\\] in docs" tmp+'+ test_done
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh
index 9671e7f..573baa8 100755
--- a/tests/t0103-log.sh
+++ b/tests/t0103-log.sh
@@ -110,4 +110,13 @@ test_expect_success 'the log draws the commit graph when enabled' '
 	grep "class=.commitgraph." tmp
 '
 
+# The search is literal, so text that is no valid regular expression still
+# finds the commit holding it.
+test_expect_success 'a search for brackets matches them literally' '
+	git -C repos/foo commit --allow-empty -m "fix [brackets] in docs" &&
+	cgit_url "foo/log&qt=grep&q=%5Bbrackets" >tmp &&
+	grep "^Status: 200" tmp &&
+	grep "fix \\[brackets\\] in docs" tmp
+'
+
 test_done