diff options
| author | Christian Hesse | 2016-09-04 12:38:18 +0200 |
|---|---|---|
| committer | Christian Hesse | 2016-09-04 12:38:18 +0200 |
| commit | 11695a58fd732689be486edf88d145578a787c89 (patch) | |
| tree | ab397b8346d89a01ecc1d99350e81f1bd7cbe7a4 /ui-log.c | |
| parent | Fix qry.head leak on error (diff) | |
| download | cgit-11695a58fd732689be486edf88d145578a787c89.tar.gz cgit-11695a58fd732689be486edf88d145578a787c89.zip | |
git: update to v2.10.0
Upstream continues to replace unsigned char *sha1 with struct object_id old_oid. This makes the required changes. The git lib has its own main function now. Rename our main function to cmd_main, it is called from main then.
Diffstat (limited to 'ui-log.c')
| -rw-r--r-- | ui-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
| diff --git a/ui-log.c b/ui-log.c index c97b8e0..a31ff7c 100644 --- a/ui-log.c +++ b/ui-log.c | |||
| @@ -49,7 +49,7 @@ static void inspect_files(struct diff_filepair *pair) | |||
| 49 | 49 | ||
| 50 | files++; | 50 | files++; |
| 51 | if (ctx.repo->enable_log_linecount) | 51 | if (ctx.repo->enable_log_linecount) |
| 52 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, | 52 | cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size, |
| 53 | &new_size, &binary, 0, ctx.qry.ignorews, | 53 | &new_size, &binary, 0, ctx.qry.ignorews, |
| 54 | count_lines); | 54 | count_lines); |
| 55 | } | 55 | } |