|
diff --git a/ui-log.c b/ui-log.c index bc0c02c..b9771fa 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -141,49 +141,49 @@ static const char *disambiguate_ref(const char *ref) |
141 | unsigned char sha1[20]; |
141 | unsigned char sha1[20]; |
142 | const char *longref; |
142 | const char *longref; |
143 | |
143 | |
144 | longref = fmt("refs/heads/%s", ref); |
144 | longref = fmt("refs/heads/%s", ref); |
145 | if (get_sha1(longref, sha1) == 0) |
145 | if (get_sha1(longref, sha1) == 0) |
146 | return longref; |
146 | return longref; |
147 | |
147 | |
148 | return ref; |
148 | return ref; |
149 | } |
149 | } |
150 | |
150 | |
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
152 | char *path, int pager) |
152 | char *path, int pager) |
153 | { |
153 | { |
154 | struct rev_info rev; |
154 | struct rev_info rev; |
155 | struct commit *commit; |
155 | struct commit *commit; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
157 | int argc = 2; |
157 | int argc = 2; |
158 | int i, columns = 3; |
158 | int i, columns = 3; |
159 | |
159 | |
160 | if (!tip) |
160 | if (!tip) |
161 | tip = ctx.qry.head; |
161 | tip = ctx.qry.head; |
162 | |
162 | |
163 | argv[1] = disambiguate_ref(tip); |
163 | argv[1] = disambiguate_ref(tip); |
164 | |
164 | |
165 | if (grep && pattern) { |
165 | if (grep && pattern && *pattern) { |
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
167 | !strcmp(grep, "committer")) |
167 | !strcmp(grep, "committer")) |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
169 | if (!strcmp(grep, "range")) |
169 | if (!strcmp(grep, "range")) |
170 | argv[1] = pattern; |
170 | argv[1] = pattern; |
171 | } |
171 | } |
172 | |
172 | |
173 | if (path) { |
173 | if (path) { |
174 | argv[argc++] = "--"; |
174 | argv[argc++] = "--"; |
175 | argv[argc++] = path; |
175 | argv[argc++] = path; |
176 | } |
176 | } |
177 | init_revisions(&rev, NULL); |
177 | init_revisions(&rev, NULL); |
178 | rev.abbrev = DEFAULT_ABBREV; |
178 | rev.abbrev = DEFAULT_ABBREV; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; |
180 | rev.verbose_header = 1; |
180 | rev.verbose_header = 1; |
181 | rev.show_root_diff = 0; |
181 | rev.show_root_diff = 0; |
182 | setup_revisions(argc, argv, &rev, NULL); |
182 | setup_revisions(argc, argv, &rev, NULL); |
183 | load_ref_decorations(DECORATE_FULL_REFS); |
183 | load_ref_decorations(DECORATE_FULL_REFS); |
184 | rev.show_decorations = 1; |
184 | rev.show_decorations = 1; |
185 | rev.grep_filter.regflags |= REG_ICASE; |
185 | rev.grep_filter.regflags |= REG_ICASE; |
186 | compile_grep_patterns(&rev.grep_filter); |
186 | compile_grep_patterns(&rev.grep_filter); |
187 | prepare_revision_walk(&rev); |
187 | prepare_revision_walk(&rev); |
188 | |
188 | |
189 | if (pager) |
189 | if (pager) |
|