| 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) (unidiff) | |
| 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
| @@ -28,17 +28,17 @@ void inspect_files(struct diff_filepair *pair) | |||
| 28 | { | 28 | { |
| 29 | unsigned long old_size = 0; | 29 | unsigned long old_size = 0; |
| 30 | unsigned long new_size = 0; | 30 | unsigned long new_size = 0; |
| 31 | int binary = 0; | 31 | int binary = 0; |
| 32 | 32 | ||
| 33 | files++; | 33 | files++; |
| 34 | if (ctx.repo->enable_log_linecount) | 34 | if (ctx.repo->enable_log_linecount) |
| 35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
| 36 | &new_size, &binary, count_lines); | 36 | &new_size, &binary, 0, count_lines); |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | void show_commit_decorations(struct commit *commit) | 39 | void show_commit_decorations(struct commit *commit) |
| 40 | { | 40 | { |
| 41 | struct name_decoration *deco; | 41 | struct name_decoration *deco; |
| 42 | static char buf[1024]; | 42 | static char buf[1024]; |
| 43 | 43 | ||
| 44 | buf[sizeof(buf) - 1] = 0; | 44 | buf[sizeof(buf) - 1] = 0; |