diff options
author | Lars Hjemli | 2010-06-22 16:16:24 +0200 |
---|---|---|
committer | Lars Hjemli | 2010-06-22 16:16:24 +0200 |
commit | 6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d (patch) | |
tree | f03c3c3621b343493fb3c834ba3b8e4ebfe09471 /ui-log.c | |
parent | Merge branch 'jh/context-lines' (diff) | |
parent | ui-log.c: allow commit range as search expression (diff) | |
download | cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.gz cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.zip |
Merge branch 'lh/range-search'
Diffstat (limited to 'ui-log.c')
-rw-r--r-- | ui-log.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui-log.c b/ui-log.c index 5eb5c81..33ec8a9 100644 --- a/ui-log.c +++ b/ui-log.c | |||
@@ -149,10 +149,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
149 | 149 | ||
150 | argv[1] = disambiguate_ref(tip); | 150 | argv[1] = disambiguate_ref(tip); |
151 | 151 | ||
152 | if (grep && pattern && (!strcmp(grep, "grep") || | 152 | if (grep && pattern) { |
153 | !strcmp(grep, "author") || | 153 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
154 | !strcmp(grep, "committer"))) | 154 | !strcmp(grep, "committer")) |
155 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 155 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
156 | if (!strcmp(grep, "range")) | ||
157 | argv[1] = pattern; | ||
158 | } | ||
156 | 159 | ||
157 | if (path) { | 160 | if (path) { |
158 | argv[argc++] = "--"; | 161 | argv[argc++] = "--"; |