author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:24 (UTC) |
commit | 6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d (patch) (unidiff) | |
tree | f03c3c3621b343493fb3c834ba3b8e4ebfe09471 /ui-log.c | |
parent | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (diff) | |
parent | a579fb02561c98a146c9e707d098d2b10aa02015 (diff) | |
download | cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.zip cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.gz cgit-6654d5b7bdc1d775cf09ca6690b1fc5ecea4696d.tar.bz2 |
Merge branch 'lh/range-search'
-rw-r--r-- | ui-log.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -144,20 +144,23 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
144 | int argc = 2; | 144 | int argc = 2; |
145 | int i, columns = 3; | 145 | int i, columns = 3; |
146 | 146 | ||
147 | if (!tip) | 147 | if (!tip) |
148 | tip = ctx.qry.head; | 148 | tip = ctx.qry.head; |
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++] = "--"; |
159 | argv[argc++] = path; | 162 | argv[argc++] = path; |
160 | } | 163 | } |
161 | init_revisions(&rev, NULL); | 164 | init_revisions(&rev, NULL); |
162 | rev.abbrev = DEFAULT_ABBREV; | 165 | rev.abbrev = DEFAULT_ABBREV; |
163 | rev.commit_format = CMIT_FMT_DEFAULT; | 166 | rev.commit_format = CMIT_FMT_DEFAULT; |