author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:16:12 (UTC) |
commit | 6f92f332e6a9ee3e16051bda9fe148607af67f65 (patch) (side-by-side diff) | |
tree | 49cb7d145fbf40793b220efdc92cd80ab2c6ca05 /ui-log.c | |
parent | 37a24e4e39737edaa5cdde501346a65eeb280e63 (diff) | |
parent | d20313e3daf855ee5d4808e050f54614c200d7b1 (diff) | |
download | cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.zip cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.gz cgit-6f92f332e6a9ee3e16051bda9fe148607af67f65.tar.bz2 |
Merge branch 'jh/context-lines'
Conflicts:
cgit.c
cgit.h
-rw-r--r-- | ui-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,33 +20,33 @@ void count_lines(char *line, int size) if (line[0] == '+') add_lines++; else if (line[0] == '-') rem_lines++; } void inspect_files(struct diff_filepair *pair) { unsigned long old_size = 0; unsigned long new_size = 0; int binary = 0; 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, count_lines); } void show_commit_decorations(struct commit *commit) { struct name_decoration *deco; static char buf[1024]; buf[sizeof(buf) - 1] = 0; deco = lookup_decoration(&name_decoration, &commit->object); while (deco) { if (!prefixcmp(deco->name, "refs/heads/")) { strncpy(buf, deco->name + 11, sizeof(buf) - 1); cgit_log_link(buf, NULL, "branch-deco", buf, NULL, ctx.qry.vpath, 0, NULL, NULL, ctx.qry.showmsg); } |