|
diff --git a/ui-log.c b/ui-log.c index d38e40a..e7f7d6f 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -42,37 +42,40 @@ void print_commit(struct commit *commit) |
42 | if (cgit_repo->enable_log_linecount) { |
42 | if (cgit_repo->enable_log_linecount) { |
43 | html("</td><td class='right'>"); |
43 | html("</td><td class='right'>"); |
44 | htmlf("%d", lines); |
44 | htmlf("%d", lines); |
45 | } |
45 | } |
46 | } |
46 | } |
47 | html("</td><td>"); |
47 | html("</td><td>"); |
48 | html_txt(info->author); |
48 | html_txt(info->author); |
49 | html("</td></tr>\n"); |
49 | html("</td></tr>\n"); |
50 | cgit_free_commitinfo(info); |
50 | cgit_free_commitinfo(info); |
51 | } |
51 | } |
52 | |
52 | |
53 | |
53 | |
54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager) |
54 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) |
55 | { |
55 | { |
56 | struct rev_info rev; |
56 | struct rev_info rev; |
57 | struct commit *commit; |
57 | struct commit *commit; |
58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
58 | const char *argv[] = {NULL, tip, NULL, NULL, NULL}; |
59 | int argc = 2; |
59 | int argc = 2; |
60 | int i; |
60 | int i; |
61 | |
61 | |
62 | if (!tip) |
62 | if (!tip) |
63 | argv[1] = cgit_query_head; |
63 | argv[1] = cgit_query_head; |
64 | |
64 | |
65 | if (grep) |
65 | if (grep && pattern && (!strcmp(grep, "grep") || |
66 | argv[argc++] = fmt("--grep=%s", grep); |
66 | !strcmp(grep, "author") || |
| |
67 | !strcmp(grep, "committer"))) |
| |
68 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
| |
69 | |
67 | if (path) { |
70 | if (path) { |
68 | argv[argc++] = "--"; |
71 | argv[argc++] = "--"; |
69 | argv[argc++] = path; |
72 | argv[argc++] = path; |
70 | } |
73 | } |
71 | init_revisions(&rev, NULL); |
74 | init_revisions(&rev, NULL); |
72 | rev.abbrev = DEFAULT_ABBREV; |
75 | rev.abbrev = DEFAULT_ABBREV; |
73 | rev.commit_format = CMIT_FMT_DEFAULT; |
76 | rev.commit_format = CMIT_FMT_DEFAULT; |
74 | rev.verbose_header = 1; |
77 | rev.verbose_header = 1; |
75 | rev.show_root_diff = 0; |
78 | rev.show_root_diff = 0; |
76 | setup_revisions(argc, argv, &rev, NULL); |
79 | setup_revisions(argc, argv, &rev, NULL); |
77 | if (rev.grep_filter) { |
80 | if (rev.grep_filter) { |
78 | rev.grep_filter->regflags |= REG_ICASE; |
81 | rev.grep_filter->regflags |= REG_ICASE; |
|