Merge branch 'jh/ignorews'

[cgit.git] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index bfbe436099953599f0ef77abd2c76094599fbf89..ee93653384695d7337b3947c9c59505800ec853a 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -33,7 +33,8 @@ void inspect_files(struct diff_filepair *pair)
        files++;
        if (ctx.repo->enable_log_linecount)
                cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
-                               &new_size, &binary, count_lines);
+                               &new_size, &binary, 0, ctx.qry.ignorews,
+                               count_lines);
 }
 
 void show_commit_decorations(struct commit *commit)
@@ -149,10 +150,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
        argv[1] = disambiguate_ref(tip);
 
-       if (grep && pattern && (!strcmp(grep, "grep") ||
-                               !strcmp(grep, "author") ||
-                               !strcmp(grep, "committer")))
-               argv[argc++] = fmt("--%s=%s", grep, pattern);
+       if (grep && pattern) {
+               if (!strcmp(grep, "grep") || !strcmp(grep, "author") ||
+                   !strcmp(grep, "committer"))
+                       argv[argc++] = fmt("--%s=%s", grep, pattern);
+               if (!strcmp(grep, "range"))
+                       argv[1] = pattern;
+       }
 
        if (path) {
                argv[argc++] = "--";