summaryrefslogtreecommitdiffabout
path: root/ui-log.c
authorLars Hjemli <hjemli@gmail.com>2009-02-01 18:29:47 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-02-01 18:29:47 (UTC)
commit5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6 (patch) (unidiff)
tree823678b1c4a907cf0df50067c27fb5b752114df5 /ui-log.c
parent0b3c746ba80738dbe0885a21406409390936537c (diff)
parent481ce5e298e2dcd7edc1d4a30e523dda2ce58b01 (diff)
downloadcgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.zip
cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.gz
cgit-5e447b1ed1aa751e8ec93dccf4df6fa4a7ffddb6.tar.bz2
Merge branch 'lh/binary'
Diffstat (limited to 'ui-log.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ui-log.c b/ui-log.c
index 3202848..ba2ab03 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -23,15 +23,20 @@ void count_lines(char *line, int size)
23 else if (line[0] == '-') 23 else if (line[0] == '-')
24 rem_lines++; 24 rem_lines++;
25} 25}
26 26
27void inspect_files(struct diff_filepair *pair) 27void inspect_files(struct diff_filepair *pair)
28{ 28{
29 unsigned long old_size = 0;
30 unsigned long new_size = 0;
31 int binary = 0;
32
29 files++; 33 files++;
30 if (ctx.repo->enable_log_linecount) 34 if (ctx.repo->enable_log_linecount)
31 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 35 cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
36 &new_size, &binary, count_lines);
32} 37}
33 38
34void show_commit_decorations(struct commit *commit) 39void show_commit_decorations(struct commit *commit)
35{ 40{
36 struct name_decoration *deco; 41 struct name_decoration *deco;
37 static char buf[1024]; 42 static char buf[1024];