Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.zx2c4.com/cgit.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hesse <mail@eworm.de>2016-09-04 13:38:18 +0300
committerChristian Hesse <mail@eworm.de>2016-09-04 13:38:18 +0300
commit11695a58fd732689be486edf88d145578a787c89 (patch)
treeab397b8346d89a01ecc1d99350e81f1bd7cbe7a4 /ui-log.c
parentff9893ac8192579a00dd4c73ddff18ab232099a6 (diff)
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.c2
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)
files++;
if (ctx.repo->enable_log_linecount)
- cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size,
+ cgit_diff_files(&pair->one->oid, &pair->two->oid, &old_size,
&new_size, &binary, 0, ctx.qry.ignorews,
count_lines);
}